git checkout --ours <pathname>

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.

Sign in to enable bookmarking, reminders, progress-tracking and more...