> If there is any kind of conflict, you are making code changes in the merge commit itself to resolve it.
I don't get it. If you rebase, you get 20 chances to do the same.
I don't get it. If you rebase, you get 20 chances to do the same.
Rebasing is the process of redeveloping your feature based on the current master. This is smaller, easier steps to review later.
It is a pitty that we can't have tooling to create "hidden" merge commits to allow to connect rebased branches, this would retain the history better and allow pulling more easily.