Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

Can TFS 2012 perform merges across projects in the same collection?

Is it possible to merge changes across projects in TFS 2012? If so, it doesn't seem obvious to me how. I find myself needing to do this because we created a new project when we really should have created a branch (or reorganized our branches).

like image 341
Ben Collins Avatar asked Feb 18 '23 04:02

Ben Collins


1 Answers

You can use baseless merging from within the IDE (select merge) or using the TF command line utility. The following image shows a merge from team project Area 52 to team project Area 51, where no branch relationship exists. The IDE correctly identifies the merge as a baseless merge: baseless merge image

Caution is advised though and I recommend you read the section on baseless merging in the Branching Guide (http://vsarbranchingguide.codeplex.com/) first.

I did quick test and documented the findings here in a rough format: http://blogs.msdn.com/b/willy-peter_schaub/archive/2012/12/13/faq-branching-is-easy-but-can-i-merge-without-branching.aspx

like image 115
Willy-Peter Schaub Avatar answered Feb 26 '23 12:02

Willy-Peter Schaub