Search code examples
branchrollbackchangeset

TFS - Is it possible to rollback a changeset committed before the branching?

Suppose I Branch Solution-A, changeset 10 into Solution-B.

Later on, I realize Solution-B should not have changeset 7 in it.

Is there a way to rollback changeset 7 just from Solution B without harming solution A?

Whenever I use tf rollback, all the pending changes go to Solution-A.

Thanks in advance !

Solution

  • You have to rollback the changeset that has the merges to solution b, and then reapply the merge without changeset 7.