title: Git: Add merge rule to config for specific file
body: <p>I am using git to track a large LaTeX document which I write using Kile on different machines.</p>
  
  <p>Kile writes to its <code>.kilepr</code> config file when closing Kile. The problem I often run into is that I commit <strong>before</strong> closing Kile. So I commit and push, work on the other machine, and when I come back and want to pull I get a merge conflict because the <code>.kilepr</code> file contains the cursor position (which obviously changed now).</p>
  
  <p>My question: Is there a way to add a merge rule to git config for a specific file (always use <em>--theirs</em>)? Using <code>.gitignore</code> is not an option since the <code>.kilepr</code> file contains important information such as files in the project.</p>