TFS没有在合并目标位置显示Dev分支 [英] TFS not showing Dev branch in target locations for merging

问题描述

s/w版本: TFS2008服务器，VS2010，Windows XP

s/w versions: TFS2008 server, VS2010, windows xp

我在TFS中具有以下分支结构

I have the following branch structure in TFS

• $/根/主分支
• $/Root/Dev/Project1

Project1是几个月前从Main Branch分支出来的.现在，我需要将Main分支中的最新代码合并到Project1分支中.在此期间，一些新文件夹被添加到Main Branch.(Main Branch/CoreDataClasses/..).因此，当我尝试使用合并向导将此新文件夹合并到Project1分支中时，在目标分支列表中没有看到Project1分支.为什么TFS不在目标分支列表中显示我的dev分支?

Project1 was branched off the Main Branch, few months ago. Now I need to merge the latest code in the Main Branch to the Project1 branch. During that time, some new folders were added to the Main Branch.(Main Branch/CoreDataClasses/..). So when I try to merge this new folder into the Project1 branch using the merge wizard, I don't see the Project1 branch in the list of target branches. Why is TFS not showing me my dev branch in the target branches list?

推荐答案

请从根目录(分支所在的位置)而不是从单个文件夹进行合并.请记住，合并直到您签入后才具有破坏性，因此，如果要保留其他更改，则可以选择仅签入新文件夹.

Do your merge from the root (where you branched), not the individual folder(s). Remember that merges aren't destructive until you check in, so you can choose to only check in the new folders if you want to hold off other changes.

这篇关于TFS没有在合并目标位置显示Dev分支的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！