Resolve git am Merge Conflicts
TL;DR: After git am encounters a merge conflict, the output of git status and the working tree’s state do not show any sign of conflict like a git pull, git merge, or git rebase conflict does, which can be very confusing. To get an experience that is at least somewhat similar to those other Git commands, use git am --reject. Problem When git am is used to apply patches and encounters a merge conflict, it will print a message like this: …