git merge prefer incoming code example Example 1: git take ours git pull -X theirs Example 2: git resolve conflict using theirs git checkout --theirs path/to/file