Git taking theirs on a merge conflict


git checkout --theirs path/to/file.cpp
git add path/to/file.cpp