CODEWITHSUNDEEP
tfsmergebranching-and-merging
Jeremy
Jeremy

Reputation: 46440

merging changes in tfs

We have a main development branch, which was branched for a release 1.0. We also have branched the main development branch to do some parallel development. A hot fix was done in the release 1.0 branch and merged up to the main branch. Now parallel development is complete. Everything has been checked in. If we compare the main branch to the parallel branch we can see the differences. We want to merge from the parallel dev branch down to main, but TFS is reporting nothing to merge. What!?

Upvotes: 1

Views: 868

Answers (1)

Robaticus
Robaticus

Reputation: 23157

You'll want to do forward integration (from main to parallel) before you do your reverse integration (from parallel back to main).

Upvotes: 1

Related Questions