title: Binary File Merge in GIT in Visual Studio 2013 Ultimate
body: <p>We are using TFS with GIT for source control.</p>
  
  <p>I am trying to pull the latest version but am having issue with dll files being out of sync. </p>
  
  <p>I have done the following;</p>
  
  <p>Tried to pull the latest commits from the team explorer menu. I then get the message;</p>
  
  <blockquote>
    <p>An Error Occurred: 33 uncommitted changes would be overwritten by the merge</p>
  </blockquote>
  
  <p>So I then ran another commit and included all excluded files. This included DLLs etc.I did this by going to the team explorer -> changes</p>
  
  <p>Then added the 33 untracked files, and committed locally.</p>
  
  <p>Next, I clicked sync and then pull from the incoming commits menu.</p>
  
  <p>I then get the message;</p>
  
  <blockquote>
    <p>Pull completed with conflicts.  Resolve the conflicts and commit the results.</p>
  </blockquote>
  
  <p>i click the 'Resolve the conflicts' link and it gives a list of 77 files (dlls csproj and pdb files). See the screenshot below;</p>
  
  <p><a href="https://i.stack.imgur.com/C9Tjj.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/C9Tjj.png" alt="team explorer on merge"></a></p>
  
  <p>However, when I click the keep local or keep remote link nothing happens.</p>
  
  <p>If i select the merge button i get the message</p>
  
  <p><a href="https://i.stack.imgur.com/kQz74.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/kQz74.png" alt="git popup 2"></a></p>
  
  <p>Can someone direct me as to how to resolve this?</p>