TFS merge and branch
"Regarding code merging, we have created new folders/projects under 5.1.0.10 branch. These folders do not exist in the main XYZ2 branch. We are unable to do “merge” because merge is only if a file/folder is an offshoot of the branch. If you add these folders into the main branch manually, then connection between main branch and 5.1.0.10 branch is lost. Is there a way we can resolve this issue? Please let us know..."
-
In this case, you would have to do a “branch” from 5.1.0.10 to back XYZ2, not a merge.
(You can specify the exact target location in XYZ2 while branching)
That way, you will have a connection back to 5.1.0.10 from XYZ2.
Merge is typically when you’re merging changes from one branch back to the trunk. Here, there is no trunk to merge with.
-
PS: This could possibly also be done to merge code across different branches of a trunk
-
In this case, you would have to do a “branch” from 5.1.0.10 to back XYZ2, not a merge.
(You can specify the exact target location in XYZ2 while branching)
That way, you will have a connection back to 5.1.0.10 from XYZ2.
Merge is typically when you’re merging changes from one branch back to the trunk. Here, there is no trunk to merge with.
-
PS: This could possibly also be done to merge code across different branches of a trunk
Comments
Post a Comment