-Perform 3-way merge and create a merge commit with 2 parents. - On conflict: insert <<<<<<<, =======, >>>>>>> markers into file(s). - ❌ No rebase, squash, or fast-forward-only merges.
-Perform 3-way merge and create a merge commit with 2 parents.