title: TFS Git - pull requests 'Merge failed'
body: <p>Hi I have this problem with TFS and git pull requests.</p>
  
  <p>We have two main branches:
  -master
  -develop</p>
  
  <p>So I create new branch async_data_loading from <em>develop</em> and do some changes in it. Next I commit and push my changes to remote async_data_loading and then I create new pull request to merge my changes into remote develop and I get this:</p>
  
  <p><a href="https://i.stack.imgur.com/TqCeh.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/TqCeh.png" alt="TFS Merge fail"></a></p>
  
  <p>But when I try to find any merge conflicts from console there is none to fix...I can even merge my changes to my local develop without any problems. As you can see below my local branch and develop are on the same 'branch' so there are no conflicts to solve, just my branch is ahead of few commits.</p>
  
  <p><a href="https://i.stack.imgur.com/qFeiN.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/qFeiN.png" alt="Branches graph"></a></p>
  
  <p>Anyone had this problem and solved it? I've spent couple of hours searching for the solution but found nothing.</p>
  
  <p>The funny thing is that if I create a test branch from <em>master</em> and then follow steps as with develop there are no problems with merging my test branch to master on TFS.</p>