CODEWITHSUNDEEP
version-controltfsbranching-and-merging
Mr. Boy
Mr. Boy

Reputation: 63816

Are there any problems with branching a branch in TFS?

We branch our whole master branch in TFS, following a somewhat git-like paradigm rather than branching specific sub-folders.

I have one such branch, for a feature. However this feature ended up really being two features, one dependent on the other. It's not possible to merge back to master yet, but I would like to keep the features separate so I can merge part A while I still work on part B.

Say I am working in branch A; is it fine to branch A to branch B, and then continue working on B? I would then merge A back to master in the near future, and then merge B into master later on.

I don't know if TFS has intelligence that could make this a problem if I want to merge master -> B later on, or if TFS is totally 'dumb' with tracking branches and doesn't care about such things.

Upvotes: 0

Views: 292

Answers (1)

KMoraz
KMoraz

Reputation: 14164

In TFS 2012 merging has improved considerably. Among the improvements are the auto-merge engine, which reduces the number of conflicts and the baseless merge promotion to the UI. In your case, when there's no merge relationship between two branches, a baseless merge should be performed. Once a branch relationship is established, subsequent merges will be normal.

For more details see the ALM Rangers Version Control Guide.

Upvotes: 2

Related Questions