1
2
3
4
" Keep the current branch version
git checkout --ours <file_path>
" Keep the pulled version
git checkout --theirs <file_path>