Confirmed users
611
edits
Sheriffing/How To/Merge Conflicts: Difference between revisions
Jump to navigation
Jump to search
→Example: code added and modified, conflict fixed: explained changed line in more detail
(added: Example: code added and modified, conflict fixed) |
(→Example: code added and modified, conflict fixed: explained changed line in more detail) |
||
| Line 53: | Line 53: | ||
== Example: code added and modified, conflict fixed == | == Example: code added and modified, conflict fixed == | ||
<ol> | <ol> | ||
<li>mozilla-inbound revision [https://hg.mozilla.org/integration/mozilla-inbound/rev/f60ce40b73c519a0d3b0b2a490de9b2475f84ed7 f60ce40b73c519a0d3b0b2a490de9b2475f84ed7] should be | <li>mozilla-inbound revision [https://hg.mozilla.org/integration/mozilla-inbound/rev/f60ce40b73c519a0d3b0b2a490de9b2475f84ed7 f60ce40b73c519a0d3b0b2a490de9b2475f84ed7] should be merged to mozilla-central revision [https://hg.mozilla.org/mozilla-central/rev/46a5fc19bd7aed9fc92946215ee7f83eea279f8d 46a5fc19bd7aed9fc92946215ee7f83eea279f8d].</li> | ||
<li>This failed: | <li>This failed: | ||
<pre>~/mozilla/mozilla-unified$ hg merge -r f60ce40b73c519a0d3b0b2a490de9b2475f84ed7 | <pre>~/mozilla/mozilla-unified$ hg merge -r f60ce40b73c519a0d3b0b2a490de9b2475f84ed7 | ||
| Line 130: | Line 130: | ||
<ul> | <ul> | ||
<li>The mozilla-inbound code changes affect the code before the one changed on mozilla-central.</li> | <li>The mozilla-inbound code changes affect the code before the one changed on mozilla-central.</li> | ||
<li>On mozilla-inbound, lines got only modified, while on mozilla-central also new lines got added. This is the reason for the different number of lines between the conflict markers ( | <li>On mozilla-inbound, lines got only modified, while on mozilla-central also new lines got added. This is the reason for the different number of lines between the conflict markers (<code><<<<<<<</code> and <code>>>>>>>></code>) and the separator for the conflicting code (<code>=======</code>).</li> | ||
<li>The element used in the new code added on mozilla-central <code>node.ownerDocument</code> didn't get modified by the mozilla-inbound patch.</li> | <li>The element used in the new code added on mozilla-central <code>node.ownerDocument</code> didn't get modified by the mozilla-inbound patch.</li> | ||
<li>The patches don't share a modified line.</li> | <li>The patches don't share a modified line.</li> | ||
<li>The conflict can be resolved: The new states have to be taken into account. This means, the lines which got added remain and for the line starting with <code>if</code>, the | <li>The conflict can be resolved: The new states have to be taken into account. This means, the lines which got added remain and for the line starting with <code>if</code>, the changed version <code>if (vert) {</code> gets used instead of <code>if (this.state.vert) {</code>.</li> | ||
</ul></li> | </ul></li> | ||
<li>The end result is this: | <li>The end result is this: | ||