Git : Determine if branch is in a merge conflict state

Question

I am writing a bash script to do some automation. Part of the script involves navigating to a local repo, switching to the local master branch, then pulling the remote master to

Answer 1

This lists files with a merge conflict:

git diff --name-only --diff-filter=U