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 13:46, 8 November 2017
, 8 November 2017save progress
(explain how to resolve merge conflicts, work in progress (save to not lose progress by accident)) |
(save progress) |
||
| Line 31: | Line 31: | ||
<li>Click on 'Files' in the header and navigate to the folder which contains the file with the merge conflict. This is [https://hg.mozilla.org/mozilla-central/file/597025d8888fa91b9418231f33e65424d384d83f/mobile/android/base mobile/android/base/] in this case.</li> | <li>Click on 'Files' in the header and navigate to the folder which contains the file with the merge conflict. This is [https://hg.mozilla.org/mozilla-central/file/597025d8888fa91b9418231f33e65424d384d83f/mobile/android/base mobile/android/base/] in this case.</li> | ||
<li>Click on the [https://hg.mozilla.org/mozilla-central/log/597025d8888fa91b9418231f33e65424d384d83f/mobile/android/base/moz.build revisions] name next to the file name, in this case moz.build.</li> | <li>Click on the [https://hg.mozilla.org/mozilla-central/log/597025d8888fa91b9418231f33e65424d384d83f/mobile/android/base/moz.build revisions] name next to the file name, in this case moz.build.</li> | ||
<li>Now you can see the recent changes to the file. The latest changes got <code>pushed 2017-11-07 10:28 +0000</code> and are from [https://bugzilla.mozilla.org/show_bug.cgi?id=1413698 bug 1413698]. | <li>Now you can see the recent changes to the file. The latest changes got <code>pushed 2017-11-07 10:28 +0000</code> and are from [https://bugzilla.mozilla.org/show_bug.cgi?id=1413698 bug 1413698]. The bug contains information what changesets belong to that push. You only need that information if you want to fix the merge conflict by manually merging the code.</li> | ||
<li>Do the same thing for mozilla-inbound, this time it's mandatory. Copying the url of the tab with the revision history, opening a new tab and pasting the url while replacing "/mozilla-central/" with "/integration/mozilla-inbound/" and the revision (here "597025d8888fa91b9418231f33e65424d384d83f") with "tip" is often a useful shortcut (but will even show changes which landed after the merge candidate you picked; if you don't want that, use the revision of the merge candidate). This got [https://hg.mozilla.org/integration/mozilla-inbound/log/a84fff04d938/mobile/android/base/moz.build this changelog].</li> | |||
<li>There is one recent change <code>pushed 2017-11-07 01:43 +0000</code> from [https://bugzilla.mozilla.org/show_bug.cgi?id=1413362 bug 1413362].</li> | |||
<li>Find the changesets which got pushed for that bug in [https://bugzilla.mozilla.org/show_bug.cgi?id=1413362#c38 comment 38].</li> | |||
<li>Do a backout for these changesets:<br> | |||
<code>hg oops -esr 653c66220a5f::8b15dfaeecaa</code></li> | |||
</ol> | |||