title: What is the precise meaning of "ours" and "theirs" in git?
body: <p>This might sound like too basic of a question, but I have searched for answers and I am more confused now than before.</p>
  
  <p>What does "ours" and "theirs" mean in git when merging my branch into my other branch?
  Both branches are "ours". </p>
  
  <p>In a merge conflict is "ours" always the upper of the two versions displayed? </p>
  
  <p>Does "ours" always refer to the branch that HEAD was pointing to when the merge began? If so then why not use a clear possessive reference like "current branch's" instead of using a possessive pronoun like "ours" that is referentially ambiguous (since both branches are technically ours)? </p>
  
  <p>Or just use the branch name (instead of saying "ours" just say "local master's" or such)?</p>
  
  <p>The most confusing part to me is if I specify in a specific branch's .gitattributes file. Lets say in <strong>test branch</strong> I have the following .gitattributes file:</p>
  
  <pre><code>config.xml merge=ours
  </code></pre>
  
  <p>Now I checkout and point HEAD to <strong>master</strong> then merge in <strong>test</strong>. Since <strong>master</strong> is ours, and <strong>test</strong>'s .gitattributes is not checked out, will it even have an effect? If it does have an effect, since <strong>master</strong> is now "ours", then what will happen?</p>