Kenny Woo

finding new ways to procrastinate.

github twitter linkedin email rss
Resolving Git-am Conflicts
Jun 26, 2014
One minute read

When a conflict occurs using git am, not a single line of the patch file is applied. By using git-am’s 3-way merging method, we can resolve these issues semi-manually and in-place.

git am -3 <patch>

Any conflicts will result in files containing the below lines, allowing you to edit the files in-place.

first line (the patch file is aware of this line)
<<<<<<< HEAD
patch file is not aware of this line
=======
patch file is trying to add this line
>>>>>>> one change

Back to posts