349
edits
Line 131: | Line 131: | ||
<li> move to the top of the main line of development and merge in the feature branch<br/> | <li> move to the top of the main line of development and merge in the feature branch<br/> | ||
<code>hg up -r @</code><br/> | <code>hg up -r @</code><br/> | ||
<code>hg merge - | <code>hg merge student-bookmark-name </code><br/></li> | ||
</li> | <li> create a changeset, export it and send to the mentor for review, remember to use the log created above as a commit message<br/> | ||
<code>hg commit </code><br/> | |||
<code>hg export @ > mid-term-review.changeset </code><br/></li> | |||
</ol> </li> | </ol> </li> | ||
</ol> | </ol> |
edits