Geek Answers Handbook

TFS does not show Dev branch at merge destination

s / w version: Server TFS2008, VS2010, Windows XP

I have the following branch structure in TFS

  • $ / Root / main branch
  • $ / Root / Dev / Project1

Project 1 was forked from the Main Branch a few months ago. Now I need to merge the last code in the main branch into the Project1 branch. During this time, new folders (Main Branch / CoreDataClasses / ..) were added to the Main Office. Therefore, when I try to merge this new folder into the Project1 branch using the merge wizard, I do not see the Project1 branch in the list of destination branches. Why doesn't TFS show me my dev branch in the list of target branches?

+5
source share
3 answers

Make your merge from the root (where you fork), not separate folders. Remember that merges are not destructive until you register, so you can only check for new folders if you want to undo other changes.

+1
source

With Tfs, I had a lot more experience merging with a branch on the trunk , and I think it could be here. Of course, this may redefine your strategy, but it is doable.

, , , , , mercurial. Tfs lots , , hg merge (mercurial command)

+1

80% . , cmd . . " ".

-4

More articles:


All Articles