Conflict
↔ when 2 Commits to Merge overwrite same file, git unsure which Branch to keep
aka Merge-Conflict
References
Fast-Forward Merge
↔ Merge strategy to move pointer to Head w/o need to resolve Conflictgit merge --abort
↔ to abort Merge & return to original state before Merge (especially when unsure in Conflict)