git checkout --ours <path>

During a merge request choose the version of a file that existed in the current branch

Remember that may also refer to a full directory, including all the files in it that are involved in the merge.

Manual page
git checkout
Related commands

Welcome to GitExamples!

Sign in to gitexamples