git checkout --ours <pathname>
During a merge request choose the version of a file that existed in the current branch
Remember that
Manual page
git checkoutRelated commands
git checkout --ours <pathname>Remember that