<p>From time to time I stumble upon a statement that 'git rebase' leads to a fewer number of conflicts than 'git merge', for example here: Why does git rebase often have fewer merge conflicts than a merge?. Does it mean that there may be situations where <code>git-merge <BRANCH_A> <BRANCH_B></code> would fail, I would do <code>git reset --hard ORIG_HEAD</code>, then do <code>git-rebase <BRANCH_B> <BRANCH_A></code> and it would succeed? Can you give me an example of such situation?</p>

<h3>The technical difference</h3> <p>Imagine a history like this:</p> <pre class="prettyprint"><code> A-B-C-D-E “top-branch” \ F-G-H </code></pre> <p>Now <strong>merging</strong> <code>E</code> into <code>H</code> means: “take a diff of <code>B‣H</code> and a diff of <code>B‣E</code> and find out how to combine them”.</p> <p><strong>Rebasing</strong> on the other hand means:</p> <ul> <li>take a diff of <code>B‣F</code> and a diff of <code>B‣E</code> and find out how to combine them into <code>F’</code> </li> <li>take a diff of <code>F‣G</code> and a diff of <code>F‣F’</code> and find out how to combine them into <code>G’</code> </li> <li>take a diff of <code>G‣H</code> and a diff of <code>G‣G’</code> and find out how to combine them into <code>H’</code> </li> </ul> <p>So rebasing is exactly the same as merging <code>F</code>, then <code>G</code> and then <code>H</code> into <code>top-branch</code>.</p> <h3>Now, what does that mean for conflicts?</h3> <p>The rebase method will do the merge in way more steps. This has advantages and disadvantages.</p> <h3>Rebase > Merge:</h3> <ul> <li>Conflicts can be avoided by applying the changes in smaller (more separated) steps</li> <li>The person doing the rebase is applying (probably) <strong>his own</strong> changes one by one and resolving conflicts therein. Resolving conflicts there might be easier that having to do it all at once.</li> </ul> <h3>Merge > Rebase</h3> <ul> <li>With a rebase you run a high risk of having to resolve more conflicts, because two changes to the same codeblock that were done in two different commits might result in two conflicts during rebase, but only one in merge. Think about what happens when <code>H</code> is actually a revert of <code>F</code>.</li> <li>Even if you have the same number of conflicts, rebasing is still a more tedious process: You have to open the same file multiple to times to resolve conflicts that happened at different commits.</li> <li>Resolving the conflicts might actually be easier with a merge, because you see all the changes of both branches at once.</li> </ul> <p>In my opinion rebase is actually the worse process and while that might be possible I am having trouble imagining a situation where it actually avoids conflicts. What seems quite likely is that you have a conflict that is only caused by a one-line change in <code>F</code>. When that codeblock is further changed in <code>G</code>, you might have to resolve all of these changes as one conflict in a merge, but you only have to resolve that one-line change in a rebase. But that is not really a difference, as the conflict will only look bigger, but should be just as easy to resolve.</p>

Is it true that `rebase' leads to a fewer number of conflicts than `merge'?

Tags:

git

git-merge

git-rebase

From time to time I stumble upon a statement that 'git rebase' leads to a fewer number of conflicts than 'git merge', for example here: Why does git rebase often have fewer merge conflicts than a merge?. Does it mean that there may be situations where git-merge <BRANCH_A> <BRANCH_B> would fail, I would do git reset --hard ORIG_HEAD, then do git-rebase <BRANCH_B> <BRANCH_A> and it would succeed? Can you give me an example of such situation?

220

asked Apr 29 '13 16:04

user1042840

2 Answers

One advantage of rebasing is that you can rebase on a portion of the total commits, stabilize, commit resolutions and you now have an atomic unit of progress that can be resumed later. This can be MUCH less daunting. In fact you can rebase some then merge the rest. More flexible.

answered Oct 18 '22 12:10

Brian Gilner

The technical difference

Imagine a history like this:

 A-B-C-D-E  “top-branch”
   \ 
    F-G-H

Now merging E into H means: “take a diff of B‣H and a diff of B‣E and find out how to combine them”.

Rebasing on the other hand means:

take a diff of B‣F and a diff of B‣E and find out how to combine them into F’
take a diff of F‣G and a diff of F‣F’ and find out how to combine them into G’
take a diff of G‣H and a diff of G‣G’ and find out how to combine them into H’

So rebasing is exactly the same as merging F, then G and then H into top-branch.

Now, what does that mean for conflicts?

The rebase method will do the merge in way more steps. This has advantages and disadvantages.

Rebase > Merge:

Conflicts can be avoided by applying the changes in smaller (more separated) steps
The person doing the rebase is applying (probably) his own changes one by one and resolving conflicts therein. Resolving conflicts there might be easier that having to do it all at once.

Merge > Rebase

With a rebase you run a high risk of having to resolve more conflicts, because two changes to the same codeblock that were done in two different commits might result in two conflicts during rebase, but only one in merge. Think about what happens when H is actually a revert of F.
Even if you have the same number of conflicts, rebasing is still a more tedious process: You have to open the same file multiple to times to resolve conflicts that happened at different commits.
Resolving the conflicts might actually be easier with a merge, because you see all the changes of both branches at once.

In my opinion rebase is actually the worse process and while that might be possible I am having trouble imagining a situation where it actually avoids conflicts. What seems quite likely is that you have a conflict that is only caused by a one-line change in F. When that codeblock is further changed in G, you might have to resolve all of these changes as one conflict in a merge, but you only have to resolve that one-line change in a rebase. But that is not really a difference, as the conflict will only look bigger, but should be just as easy to resolve.

114