choosing which file version to take in a git conflict code example Example: git take ours git pull -X theirs