title: Why do I have to choose either local or server versions instead of merging (VS11/TFS2010)
body: <p>I'm trying to figure out how to resolve conflicts that arose when I updated my local workspace with changes on the server side, and I'm pretty confused as to what's going on.</p>
  
  <p>First, with one conflict, it was all exactly as I would have expected:</p>
  
  <p><img src="https://i.stack.imgur.com/OnKvs.png" alt="conflict in merge, with options to manually merge"></p>
  
  <p>Automerge failed due to conflicts, but the options I expect are presented: manual merge, take local, or take remote.</p>
  
  <p>However, in the very same changeset but with a different path, I don't get an option to merge.</p>
  
  <p><img src="https://i.stack.imgur.com/5mQA6.png" alt="similar conflict, but no way to fix it"></p>
  
  <p>Why not?  And how am I supposed to ever fix this conflict without being able to merge at some point along the way?  Is this due this being an add conflict rather than a content conflict?  If so, is there a way to force a manual merge so I don't have to write my changes again?</p>