title: VS 2013 C# and Git: .csproj files don't merge upon pulling
body: <p>Me and a friend are working on a project written in C# using VS 2013 Express with Git (<em>not</em> the VS Git Plugin, mind you), and we're running into a problem. Our workflow is setup like this: we have a central repository, and we each have our own fork of the repository that we work on separately. When our individual work is done we push to the central repository. When we want to sync with the central repository, we pull.</p>
  
  <p>The problem is that when we pull, the csproj files randomly update. Sometimes they properly update and the files that have been added since the last pull properly show up in VS, and other times the csproj file is completely unaffected.</p>
  
  <p>It's strange because the csproj gets updated properly everywhere else, including the central repository, it just sometimes doesn't update properly when we pull.</p>
  
  <p>In our <code>.gitattributes</code> file we have <code>.csproj</code> set to <code>merge=union</code>.</p>
  
  <p>The command we perform when pulling is <code>git pull upstream</code> where <code>upstream</code> is just a remote pointing to our central repository.</p>
  
  <p>Any ideas?</p>