Geek Answers Handbook

TFS Git - Pull Merge Failed Requests

Hey. I have this problem with TFS and git removal requests.

We have two main branches: -master -develop

So, I create a new async_data_loading branch from development and make some changes to it. Then I commit and push my changes to the remote async_data_loading, and then create a new transfer request to merge my changes into the remote creation, and I get the following:

TFS Merge Error

But when I try to find any merge conflicts with the console, they cannot be fixed ... I can even merge my changes into local development without any problems. As you can see below, my local branch and development are in the same “branch”, so there are no conflicts, only my branch is ahead of several commits.

Branch Charts

- ? , .

, , , , TFS.

+4
4

, . , , , - :

{_}//{_}/{full_path_to_local_file}.cs

, TFS .

, , - - , . , , , MS ...

+2

. (< >) TFS LibGit2Sharp , TFS ( , OP). :

fooobar.com/questions/1642954/...

+1

TFS 2015.2 + VS 2015.2, . , , . , .

0

, . eventvwr - .

, , diff't repo (, ). . mainline/feature ( ). Pull Requests , "", , . , , .

In the end, we found a file named '\' on its behalf. By deleting this file, I was able to clear everything. I suspect this is due to the fact that most of the PR / Merging features are happening on the Windows platform.

MS, if you listen to update eventvwr with less noisy and more substantial information.

0
source

More articles:


All Articles