title: How to merge a CSProj file in TFS, when auto merge fails
body: <p>Another Developer and I both added a new file to the same project in TFS Online (through VS 2013).  (different names) He checked in his changes.  I did a get latest.  Instead of Merging, it gave me this error:</p>
  
  <pre><code>Conflict [project file path].csproj - Unable to perform the get operation because you have a conflicting edit
  </code></pre>
  
  <p>There was no change on my side.  The project file was not updated.  The new file from his side did not get copied on to my file system.</p>
  
  <p>We have not configured any merging rules in TFS online, it is all default settings.</p>
  
  <p>Right clicking on the project in Solution Explorer does NOT bring up a Merge Option.  From Source Control Explorer, I can right click on the CSProj file, go to Merge, but that brings up a window about finding what to merge it with, and only lets you select from the same path, not selecting a version.  It complains that it is not a branch of it self, and cannot be merged.</p>
  
  <p>Here is the conflicting lines in the CSProj versions:</p>
  
  <p>Checked In CS Project, Line 1390:</p>
  
  <pre><code>&lt;Content Include="TextFile2.txt" /&gt;
  </code></pre>
  
  <p>My CS Project, Line 1390:</p>
  
  <pre><code>&lt;Content Include="TextFile1.txt" /&gt;
  </code></pre>