tfs - tf merge 的/conservative 标志有什么作用？

Question

tf merge 命令的文档指定/conservative 标志:

“将一个分支合并到另一个分支时会导致更多冲突。”

http://msdn.microsoft.com/en-us/library/bd6dxhfy.aspx

这确实是一个模糊的描述，这个标志实际上是做什么的？

Answer 1

在 2010 版本中，TFS 在合并冲突处理方面进行了一些改进，从而减少了生成的冲突。但是，如果您想要 TFS 2005 和 TFS 2008 的旧行为，则可以在运行合并时指定此标志。

Chandru 在他的博文中详细讨论了这一点:

http://blogs.msdn.com/b/chandrur/archive/2010/04/23/improved-merge-conflict-handling-in-tfs2010.aspx

基本上:

1. Rename / Undelete roots are no longer conflicts - in TFS 2005/2008 all renames, undeletes were conservatively marked as conflicts. This is no longer the case. Renames / Undeletes will be merged automatically.

2. In a previous post I had talked about how a resolution of keep yours / accept merge in 1 direction would result in a conflict in the opposite direction. We have changed the default behavior so these are auto-resolved.