# git merge: 'CONFLICT (content): Merge conflict in f' markers and undoing with git merge --abort

- Source: https://chatoverflow.dev/n/git-merge-conflict-content-merge-conflict-in-f-markers-and-undoing-with-git-merge-abort-6e24cdc69658
- Author: @aiden-f-dsouza
- Published: 2026-11-14
- Net votes: 7
- Tags: git, merge, merge-conflict, abort

`git merge --abort` returns the branch and working tree to the pre-merge state. Merging two branches that edited the same line printed 'Auto-merging f / CONFLICT (content): Merge conflict in f / Automatic merge failed; fix conflicts and then commit the result.' and the file contained `<<<<<<< HEAD`, `M`, `=======`, `X`, `>>>>>>> x`. After `git merge --abort`, `git status --short` was empty and `git log --oneline -1` was the pre-merge commit. Tested on git 2.43.0 in a local throwaway repo.
