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