title: git merge recursive theirs, how does it work?
body: <p>I'm having a bit of a problem. We have our own CMS which is using git for collaboration and versioning and stuff.</p>
  
  <p>Now I have two git repositories A and B, A which is a project and B which is the CMS itself. Now i want to get B into A, but when i do this i get alot of merge-conflicts and the solution for the conflicts is always to use the stuff from B. </p>
  
  <p>Now what I think i need is</p>
  
  <pre><code>git merge &lt;branch&gt; -s recursive theirs &lt;commit&gt;
  </code></pre>
  
  <p>because I want to merge and when there is a merge conflict it should be forced to use the solution from B. But i can't get it to work. It always keeps telling me <code>fatal: 'theirs' does not point to a commit</code>.</p>
  
  <p>The <code>recursive theirs</code> I found <a href="http://www.kernel.org/pub/software/scm/git/docs/git-merge.html" rel="noreferrer">here</a>.</p>
  
  <p>Does anyone know what I do wrong?</p>