Git resuelve conflicto usando el suyo
git checkout --theirs path/to/file
The Strangest Salamander
git checkout --theirs path/to/file
git pull -X theirs
(awesome-new-feature) git checkout --theirs .