63244727_SoftwareSwirl__Incremental_merge
[0] Recommendations [Direct merge] In a merge-based workflow, use direct merge for simple merges. If a difficult conflict arises, switch to incremental merge and then simplify the results into a simple merge. [Rebase] In a rebase-based workflow with unpublished local changes, use rebase to update your work onto upstream changes if you only expect trivial conflicts. If you expect (or, midway through the rebase, encounter) nontrivial conflicts, switch to incremental merge and then simplify the results into a rebase. [Incremental merge] 
Use incremental merge when: a simple merge or rebase is desired but the conflicts are nontrivial you would like to rebase work that has already been published (simplify results to rebase-with-history) you want to retain a permanent record of how conflicts were resolved you want to collaborate on a merge or rebase
SoftwareSwirl
Incremental merge