Git: Why does rebase result in conflicts while merge does not?

Question

I\'m probably not getting something right, but could anyone explain to me why git rebase results in conflicts, while git merge (same branch) does not?

Answer 1

During a rebase, you apply all commits of some branch on top of another one. It is possible that one of those commits has a conflict that you solved in a subsequent commit. Hence, the merge operation has no conflict whereas the rebase lead to intermediate conflicts.

See also git rerere which allows you to automatically solve conflicts that you already solved.