Git resolve conflitos usando o deles
git checkout --theirs path/to/file
The Strangest Salamander
git checkout --theirs path/to/file
git pull -X theirs