title: Make remote branch take precedence during a merge conflict
body: <p>I have two branches, <code>current</code> and <code>master</code>. <code>current</code> is dozens of commits ahead of <code>master</code> so I think it's time to merge.</p>
  
  <p>I change to <code>master</code></p>
  
  <pre><code>git checkout master
  </code></pre>
  
  <p>I attempt to merge with <code>current</code></p>
  
  <pre><code>get merge current
  </code></pre>
  
  <p>I get about 20 conflicts of this nature:</p>
  
  <pre><code>CONFLICT (rename/add) &lt;remote&gt;
  CONFLICT (rename/add) &lt;remote&gt;
  </code></pre>
  
  <p>First question, how do I make the remote branch, <code>current</code> take precedence here? I'm working my way through all the conflicts with <code>git mergetool -t meld</code> and I'm clicking away, selecting all the remote changes over the local changes. </p>
  
  <p>So how can I do this with one command? I want remote to take presence.</p>
  
  <p>Also, why have these conflicts occurred? I would have thought it obvious that the latest branch would contain the changes we want to keep?</p>