TFS生成:不支持有关项目冲突自动合并oprtion不支持、冲突、项目、TFS

2023-09-06 07:03:08 作者:空城只有旧梦

每当我跑我的生成失败,出现此错误消息:

Whenever I run my build it fails with this error message:

自动合并oprtion不支持的项目ManagementService.cs冲突

"The auto merge oprtion is not supported for the conflict on item ManagementService.cs"

我该如何解决这个问题?

How can I solve this?

推荐答案

听起来好像没有为上述文件源代码控制冲突。这种情况通常发生在两个人编辑同一个文件和TFS无法决定哪些改变以保持。这通常被称为一个合并冲突,因为当你尝试合并(检查)更改与什么是当前存储在服务器上。发生

It sounds like there is a source control conflict for the mentioned file. This typically occurs when two people edit the same file and TFS is unable to decide which change to keep. This is typically known as a merge conflict, because it happens when you try to merge (check in) your changes with what's currently stored on the server.

如果它发生不是当你尝试检查你的改变(这是常见的情况),而是作为构建过程的一部分,它可能是由于从previous构建遗留下来的文件。请确保您的源$ C ​​$ C是建立在一个空目录。

If it happens not when you try to check in your changes (which would be the common case), but rather as part of the build process, it could be due to files left over from previous builds. Make sure that your source code is built in an empty directory.

做不到一切,检查出的源$ C ​​$ C一个新的副本,以一个独立的工作区,并确认您的现有工作区还没有以某种方式被损坏。我可以推荐超越比较做快速递归目录比较。

Failing all else, check out a fresh copy of the source code to a separate workspace and verify that your existing workspace has not somehow been corrupted. I can recommend Beyond Compare for doing quick recursive directory comparisons.