Suppose I register a change in the wrong TFS branch. I need to make changes to another branch and then eliminate those changes from the wrong branch. Can this be done without resorting to selective copy / paste? In the end, I want my changes to the branch I mistakenly added to them ... not yet.
If I didn’t check the changes, I could postpone them and then use tfpt to move to another branch . But this will not work, as I already checked the changes.
Example:
I have an environment with a MAIN and DEVELOPMENT branch. I need to create a new module called Buzzsaw. I have a solution open and detached from the changes. Then I check them out. Unfortunately. I understand that I just checked my module in MAIN, but it had to be checked in DEVELOPMENT. I can discard the erroneous set of changes, but then I need to manually apply the changes to the DEVELOPMENT. Most of the affected files are the same between the branches, but there are enough differences that I would prefer not to copy and make my changes.
I could merge my changes from MAIN to DEV and then undo MAIN. But now it’s hard to revert changes to MAIN when I really want to introduce them (merging DEV with MAIN now does not move this set of changes, since it has already been merged).
What can I do? Is there a clean enough way to do this?
source share