See conflicted files git diff --name-only --diff-filter=U Commit with multi line messages git commit -F- <<EOF - Your message 1 - Your message 2 EOF