Confirmed users
611
edits
Sheriffing/How To/Merge Conflicts: Difference between revisions
Jump to navigation
Jump to search
Sheriffing/How To/Merge Conflicts (view source)
Revision as of 22:20, 30 November 2017
, 30 November 2017no edit summary
(First final version of example) |
No edit summary |
||
| Line 42: | Line 42: | ||
<code>hg commit</code></li> | <code>hg commit</code></li> | ||
<li>Push the backout and the merge to central:<br> | <li>Push the backout and the merge to central:<br> | ||
<code>hg push tip central</code></li> | <code>hg push -r tip central</code></li> | ||
<li>Update the bug about the backout.</li> | <li>Update the bug about the backout.</li> | ||
<li>Merge back from central as usual.</li> | <li>Merge back from central as usual.</li> | ||