63244727_SoftwareSwirl__Incremental_merge
[0] Size of conflicts [Direct merge] All of the changes in master have to be combined with all of the changes in branch in one go. Various changes are mixed up together, even if they were originally committed separately, which can make the conflict large or even intractable. [Rebase] One step of a rebase requires one change from branch to be resolved with all of the changes from master. This is easier than doing a direct merge in one step, but still mixes up unrelated changes. [Incremental merge] 
At any step, only one change from master has to be combined with one change from branch. The commit messages and deltas from each of the two changes are available to help you understand the two changes.
SoftwareSwirl
Incremental merge