tfs - merging changes in tfs

Question

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!?

Answer 1

在进行反向集成（从并行返回到主）之前，您需要进行正向集成（从主到并行）。