Overview git add 4.txt git commit -m "Resolve 4.txt merge conflict" The repository now has an explicit record of the resolution.