index > Team Foundation Server - Version Control > Merging: How is the target branch determined (or: how to merge)

Merging: How is the target branch determined (or: how to merge)


Hi,

I am trying to merge a changeset into another branch. I'd like to know how Team Foundation Source Control determines what target branches are possible to choose.
Let me explain by examplifying. My branch setup is this

The root is branched into 2 separate branches, A and B
A is later branched once more, so we have A and A.a.
Now, I'd like to merge a changeset from the branch A.a directly into B without merging the change into branch A. Is this possible? The target branches I get when I choose the A.a source tree is only A, not B.

Thomas L
No, that's not possible. You can only merge between direct branch parents/children.
Richard Berg MSFT

While Richard is correct that a regular merge must be between items with a direct merge relationship, you can use a baseless merge to create that relationship between two items that are not related by branch history.

http://blogs.msdn.com/buckh/archive/2006/02/06/525896.aspx

Buck




http://blogs.msdn.com/buckh
Buck Hodges

Maybe a late reaction to this post, I did not realize this limitation until today.

This is a TFS/SC limitation that is hard to accept and definitely a merge function that you expect to find in an advanced version contol tool.

If the merge tool traverses the version tree of each file it would find the common anchestor and then a three-way merge could take place.

Will this function be available in a future version (from the GUI)?

GT_MSDN
reply 4

You can use google to search for other answers

 

More Articles

tf.exe gets stuck doing a Get from a label
Set check-in policy on folder level
Where is the Check out ?
Getting latest versions for non-labeled elements in Get by Label ...
RE: Checkin a project into VSS 2005
GetLatestVersion while compiling
ACL programmatically
Error when merging in TS
Branching
Check out source code from Solution Explorer and not from Source ...
Welcome to Bokebb   New Update   Joins the collection  
 

New Articles

How do I start a new team project based …
Web Project: Projects have recently been…
Is Visual Studio Team Suite 2005 Provide…
Changesets newbie
Bug: Remove Becomes Delete
Changes exist in branch, but IDE states …
Pending changes shows items checked out …
TFS source control storage area
Adding existing code to the Source Control
How does the OverlayIconIndex property o…
Feature request - Check in approvals
XML differencing supported?
TF.EXE label by workspace
Weird Compare Issue
VSS Migration Error

Hot Articles

Monitoring Version Control Activity
How do i setup web development?
The Selected file cannot be opened as a …
How to sync up source code after tempora…
Show all files in a project which are ou…
Adding existing Web Application - Local …
TreeDiff - another usefull entry point f…
Problems while using TFVC Web Service
Problem with source control (Data is Nul…
Recover files directly from TfsVersionCo…
Problem resolving merge conflict
Is it a recommended practice using Sourc…
"retiring" or locking a branch…
No changes to merge message
Merging work-items

Recommend Articles

Accessing workspace on multiple computers
Adding an exisiting project to source co…
Power Toy issue
Lock Project recursively
Error: TF60059 Incremental Migration TF…
Problem with check in after merge
Problem with loading solutions (using te…
How do I secure a branch?
A client application for Team Foundation?
TFS "Branch on Checkout"
Tracing back a branch
Check-in policy distribution
VS SP1
Rollback Changeset
TF hanging