Home/ Questions/Q 945013
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-05-15T22:41:10+00:00

I performed the following actions in TFS: Accidentally made some changes to a bunch

  • 0

I performed the following actions in TFS:

  1. Accidentally made some changes to a bunch of files in the trunk
  2. Realized it.
  3. merged the changes to the intended branch
  4. rolled back the changes in the trunk (using tfpt rollback)
  5. later, during the regularly scheduled forward integration from the trunk, I undid the changes in the branch.

How can I reapply the changes? There are three changesets and about 80 files in question.

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    What I ended up doing was a forced merge:

    tf merge /r /force $/source/trunk $/source/branch1 /v:C123~125

    I will watch this set of changes carefully when we reverse integrate back into the trunk.

    I also tried a tricksy workflow of using tfpt to rollback, shelve, and unshelve /migrate. Unfortunately the conflict resolution dialogue in tfpt unshelve is a bit lacking – missing things like default buttons and stuff, so I had to mouse-click half a dozen times or so per file. So I decided after a few files to try something else first.

    • 0