TFS Git - 拉取请求'合并失败' [英] TFS Git - pull requests 'Merge failed'

问题描述

您好我有TFS和git pull请求的问题。

我们有两个主要分支：
-master
-develop p>

因此，我从 develop 创建了新的分支async_data_loading，并对其进行了一些更改。接下来，我将提交并推送到远程async_data_loading的更改，然后创建新的请求将我的更改合并到远程开发中，并得到以下代码：

但是，当我尝试从控制台发现任何合并冲突时，没有任何可解决的问题......我甚至可以将我的更改合并到本地开发中任何问题。正如你可以看到下面我的本地分支和开发是在同一个'分支'，所以没有冲突解决，只是我的分支提前几次。

< a href =https://i.stack.imgur.com/qFeiN.png =nofollow noreferrer>

任何人有这个问题并解决了它？我花了几个小时寻找解决方案，但什么都没找到。

有趣的是，如果我从 master 创建测试分支，然后按照开发步骤进行操作，将测试分支合并到TFS上并没有问题。

解决方案

解决方案

好的问题是现在修好。我们发现其中一个文件夹中的一些文件被复制，并且他们的名字是这些文件在开发者系统中的完整路径，例如：当我们删除这些文件时，TFS突然可以在服务器上完成合并而不会抱怨。

惹恼我的是没有任何信息为什么在服务器上合并失败。这肯定是MS应该在未来应该解决的问题......

Hi I have this problem with TFS and git pull requests.

We have two main branches: -master -develop

So I create new branch async_data_loading from develop 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:

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.

Anyone had this problem and solved it? I've spent couple of hours searching for the solution but found nothing.

The funny thing is that if I create a test branch from master and then follow steps as with develop there are no problems with merging my test branch to master on TFS.

解决方案

Ok the problem is fixed now. We found out that some files from one of the folders were copied and their names were the full path to these files on one of the developers system, something like this:

{PC_name}/Users/{user_name}/{full_path_to_local_file}.cs

When we removed these files TFS suddenly were able to complete merge on server without complaining.

The thing that annoys me is the lack of any information why merge on server failed. This is surely something that MS should fix in a future...

这篇关于TFS Git - 拉取请求'合并失败'的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！