How do I tell git to always select my local version for conflicted merges on a specific file?
- by saffsd
Say I'm collaborating with someone via a git repository, and there is a particular file that I never want to accept any external changes to.
Is there any way for me to set up my local repo to not complain about a conflicted merge every time I git pull? I'd like to always select my local version when merging this file.