63244727_SoftwareSwirl__Incremental_merge
[0] Effort [Direct merge] The least amount of effort, if there are only a few simple conflicts. Effort increases highly nonlinearly in the size of the conflict. [Rebase] A bit more effort, if conflicts are simple and isolated. Conflicts tend to be smaller than for direct merge, but more numerous. If there are sequential overlapping conflicts, you might need to resolve similar conflicts multiple times. [Incremental merge] 
More processing power required at start of merge. Conflicts are resolved as lots of little conflicts, so the effort scales closer to linearly with the number of pairwise conflicts [2]. Benefits decrease if original changes were not committed in small, self-contained steps.
SoftwareSwirl
Incremental merge