TFS 2010 Merge after renaming a root branch

Jag*_*dda 7 merge branch rename tfs2010

My source code branch contains almost 20000 files. I created a branch a couple of months ago called, "v2.5TEMP", which was branched off the "Main" trunk. Developers were working in both branches.

I then renamed "v2.5TEMP" to simply "v2.5." People have been working on this version which has now been released. I'm trying to merge from the v2.5 into the "Main" trunk, and am seeing every single file marked as requiring a merge.

Looking at the check ins over the past couple of months, there have been code changes, but not every file should need merging. It appears as though renaming the branch has marked each file as having changed and now requiring a merge from "v2.5" into "Main".

I don't want to have to check each and every file (20000), or have to go through each check in history and work out what needs merging.

Fuz*_*gic 6

是的,这是在TFS中重命名分支时发生的情况.

有效地重命名根文件夹会导致该分支中每个文件的重命名 - 因此当每个文件最终合并时会发生冲突.

@ ZephanSchroeder对这个问题的回答更详细地解释了一些事情.

请注意,在使用自动合并将正常工作,所以你不严格需要检查每一个冲突.但是在合并时它仍然是一个巨大的痛苦,因为你无法看到实际发生了什么变化.

我们团队的开发人员被告知不要重命名分支,因为它不值得之后引起的混乱!