git accept incoming changes for all code example
Example 1: git resolve conflict using theirs
git pull -X theirs
Example 2: git accept incoming changes for all
git checkout --theirs path/to/file
git pull -X theirs
git checkout --theirs path/to/file