title: Resolving a 'both added' merge conflict in git?
body: <p>I'm rebasing in git, and one conflict I get is 'both added' - that is, exactly the same filename has been added independently in my branch, and in the branch I'm rebasing on.  <code>git status</code> tells me:</p>
  
  <pre><code># Unmerged paths:
  #   (use "git reset HEAD &lt;file&gt;..." to unstage)
  #   (use "git add/rm &lt;file&gt;..." as appropriate to mark resolution)
  #
  #       both added:         src/MyFile.cs
  </code></pre>
  
  <p>My question is, how do I resolve this?  Must I use a merge tool or is there a way I can do it just from the commandline?  If I <code>git rm src/MyFile.cs</code>, how does git know which file version I want to remove and which I want to keep?</p>