title: Why is the meaning of “ours” and “theirs” reversed with git-svn
body: <p>I use git-svn and I noticed that when I have to fix a merge conflict after performing a <code>git svn rebase</code>, the meaning of the <code>--ours</code> and <code>--theirs</code> options to e.g. <code>git checkout</code> is reversed. That is, if there's a conflict and I want to keep the version that came from the SVN server and throw away the changes I made locally, I have to use <code>ours</code>, when I would expect it to be <code>theirs</code>.</p>
  
  <p>Why is that?</p>
  
  <p>Example:</p>
  
  <pre><code>mkdir test
  cd test
  svnadmin create svnrepo
  svn co file://$PWD/svnrepo svnwc
  cd svnwc
  echo foo &gt; test.txt
  svn add test.txt
  svn ci -m 'svn commit 1'
  cd ..
  git svn clone file://$PWD/svnrepo gitwc
  cd svnwc
  echo bar &gt; test.txt 
  svn ci -m 'svn commit 2'
  cd ..
  cd gitwc
  echo baz &gt; test.txt 
  git commit -a -m 'git commit 1'
  git svn rebase
  
  git checkout --ours test.txt
  cat test.txt 
  # shows "bar" but I expect "baz"
  
  git checkout --theirs test.txt
  cat test.txt 
  # shows "baz" but I expect "bar"
  </code></pre>