为什么在TFS中所有文件都标记为“合并"? [英] Why are all files marked with 'merge' in TFS?

问题描述

我正在将开发部门合并到主部门.我在开发分支中仅更改了一部分文件，所有其他文件应保持不变.从逻辑上讲，我只想合并已更改的文件.我不会签入未更改的文件.

I am merging my development branch into the main branch. There is only a subset of files that I have changed in my development branch, all other files should remain unchanged. Logically, I only want to merge files which I've changed. I would not check in a file which I did not change.

但是当我在TFS中进行合并操作时，它会用更改类型'合并'标记树中的每个文件.看来我必须检入整个源代码树中的每个文件！我真的不想这样做，因为这样就不可能查看变更集并查看我作为项目一部分正确更改的文件.

But when I do the merge operation in TFS, it marks every single file in the tree with change type 'merge'. It looks like I must checkin every single file in the whole source code tree! I really do not want to do this becasue then it becomes impossible to look at the changeset and see what files I acctually changed as part of my project.

起初，我以为我可以使用tfpt.exe撤消未更改命令撤消所有合并"更改，但这不会撤消那些更改.

At first, I thought I could use the tfpt.exe Undo Unchanged command to undo all the 'merge' changes, but this won't undo those changes.

有人对此有任何想法吗?谢谢.

Anyone have any ideas on this? thanks.

推荐答案

有很多可能的原因.这不是完整的列表:

There are a number of possible reasons. This is not a complete list:

• 您在以下位置的父文件夹上执行了名称空间操作(删除，取消删除，重命名) 标为合并"的文件
• 您执行了已在目标分支中执行的名称空间操作(删除，取消删除，重命名)
• 您执行了一系列名称空间操作，这些操作折叠为无操作(例如，删除+取消删除或重命名a-> b-> a)
• 有未解决的冲突
• 您执行丢弃操作

• You performed a namespace operation (delete, undelete, rename) on a parent folder of the files marked "merge"
• You performed a namespace operation (delete, undelete, rename) that had already been performed in the target branch
• You performed a sequence of namespace operations that collapsed into a no-op (eg delete + undelete, or rename a -> b -> a)
• There are unresolved conflicts
• You performing a discard

注意:所有这些均均适用于2005& 2008.

Note: all of these apply equally to 2005 & 2008.

这篇关于为什么在TFS中所有文件都标记为“合并"?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！