Posts

Showing posts from November, 2013

Baseless Merge with TFS 2010

In VS 2012 we got UI for Baseless code merge But for VS2010 we need to use command line tool. When you would like to use Source Control Merge Wizard in Visual Studio (e.g.; by right clicking a branch folder then going to 'Branching and Merging' -> 'Merge') and you find that the intended target is not in the 'Target branch' selection that means the source does not have any relationship with the target. You can proof this from 'Branching and Merging' -> 'View Hierarchy' option. This is when we need to do baseless merge operation.  To perform this operation, we can use the merge command on TFS command line tool. The syntax is Tf merge /baseless /recursive /version:[versionspec] [source path] [target path] - path can be physical folder or source control location. - [versionspec] can be a changeset, range of (inclusive) changesets separated by '~' character, a label, a date or versions. If we don't specify /version then