gistfile1.txt

❯ git status
On branch hjkl
nothing to commit, working directory clean

❯ cat A.md
hjkl

❯ git merge qwer
Auto-merging A.md
CONFLICT (content): Merge conflict in A.md
Automatic merge failed; fix conflicts and then commit the result.
 ✘ konrad@haswellpro ⮀ ⭠ hjkl± ⮀ ~/tmp/arz ⮀
❯ cat A.md
<<<<<<< HEAD
hjkl
=======
qwer
>>>>>>> qwer

❯ git checkout --ours A.md

❯ cat A.md
hjkl

❯ git status
On branch hjkl
You have unmerged paths.
  (fix conflicts and run "git commit")

Unmerged paths:
  (use "git add <file>..." to mark resolution)

  both modified:   A.md

no changes added to commit (use "git add" and/or "git commit -a")

❯ git add A.md

❯ git status
On branch hjkl
All conflicts fixed but you are still merging.
  (use "git commit" to conclude merge)

nothing to commit, working directory clean

❯ cat A.md
hjkl

❯ git checkout --theirs A.md

❯ cat A.md
hjkl

❯ git status
On branch hjkl
All conflicts fixed but you are still merging.
  (use "git commit" to conclude merge)

nothing to commit, working directory clean