title: Have Git Select Local Version On Merge Conflict on a Specific File?
body: <p>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.</p>
  <p>Is there any way 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.</p>