This shows you the differences between two versions of the page.
Both sides previous revisionPrevious revisionNext revision | Previous revision | ||
test:pullrequests [2013/07/18 12:29] – Added note about the non-fatal bookmarks error rhauck | test:pullrequests [2014/12/09 15:48] (current) – external edit 127.0.0.1 | ||
---|---|---|---|
Line 21: | Line 21: | ||
- Push to the test-master local clone < | - Push to the test-master local clone < | ||
- Switch to the root directory of the test-master < | - Switch to the root directory of the test-master < | ||
- | - (Optional) To confirm you've pulled the changes from the second local clone, again, compare your two local clones. < | + | - (Optional) To confirm you've pulled the changes from the second local clone, again, compare your two local clones. < |
- | - Merge those commits into your test-master clone < | + | - Check if the new branch created additional heads:< |
- | - Commit the merge < | + | cd ../ |
+ | hg heads | ||
+ | </ | ||
+ | - If there is more than one head, merge the branch: | ||
+ | hg merge | ||
+ | hg commit -m " | ||
+ | - or possibly rebase it - | ||
+ | hg rebase | ||
+ | </ | ||
+ | - If there is only one head, continue to the next step | ||
- Push the changes to the server: < | - Push the changes to the server: < |