title: .gitattributes merge strategy
body: <p>I tried to add a merge strategy to my .gitattributes file in my repository.
  But when I merge another branch with that (different) file it results in a merge-conflict - auto merge failed.</p>
  
  <p>Here's what I try to do.</p>
  
  <p>.gitattributes:</p>
  
  <pre><code>backend/library/project/config.php merge=ours
  </code></pre>
  
  <p>Branches:</p>
  
  <ul>
  <li>production</li>
  <li>staging</li>
  </ul>
  
  <p>in production I have config.php'A and in staging I have config.php'B. </p>
  
  <pre><code>&gt; git checkout production
  
  &gt; git merge staging 
  
  &gt; Auto-merging backend/library/project/config.php
  &gt; CONFLICT (content): Merge conflict in backend/library/project/config.php
  &gt; Automatic merge failed; fix conflicts and then commit the result.
  </code></pre>
  
  <p>I tried adding the line to .git/info/attributes as well as adding quotes to ..merge="ours".</p>
  
  <p>Has anybody an idea what I am doing wrong? (Git-version is 1.7.4.4)
  thx</p>