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