Geek Answers Handbook

Is there a TFS fork of the child parent relationship?

When you make branches in tfs, does it matter if you branch A to B or from B to A? The fact is that we have branch A and branch B, and now branch A is messed up, and we would like to recreate it from branch B by branching a new branch from B. As far as I know, when you make a branch, you get a connection between the branches but you don’t get the parent-child relationship, is that true?

Is my question clear?

+1
source share
1 answer

At the point where the new branch is built, it becomes equal to what you selected the branch from.
The difficult point of TFS merging (unlike, for example, for P4 integration or ClearCase merging) is that at any merge point A → B and B → A do not generate an equal number of merge candidates.

Let say that the branch A generates the branch B:

------->A
         \
          \
           -----> B

Let's say you make changes to A:

------->A-->A'
         \
          \
           -----> B

If you try to merge A '-> B, you will receive as a merge of candidates all your changes / source files that have been changed from A → A'.
But if you try to merge B → A ', you will not get any merge candidates at all.

This behavior is independent of the fact that A is "parent".

"A" B → A, :

(, , , , - TFS-: R.Banks)

+6

More articles:


All Articles