git merge conflict accept all current changes for all files code example Example: git take ours git pull -X theirs