How do I recover changes from an incorrect merge?
My team received a support request from a user who suspended a change set in their workspace to work on a more pressing issue. Upon resuming the change set he had merge conflicts that needed to be resolved. He accepted the auto merge results and they were checked into the change set. He later discovered that the results of the merge were incorrect. Can the merge operation be undone or replayed? Should the results of the merge be checked into a new change set so it can be reversed? How have others handled this situation?
Thanks,
-Dave
Thanks,
-Dave
One answer
If the merge results have been checked in to the same change set as one
of the conflicting changes, then unfortunately, there is no way (that I
know of) to undo/redo the merge.
I've submitted work item 108903 ("Always place merge results in a
separate change set") to address this problem.
Until that's automated, my advice is to get in the habit of completing
the conflicting change sets before starting the merge (which forces the
merge to create a new change set).
Cheers,
Geoff
dlrostoc wrote:
of the conflicting changes, then unfortunately, there is no way (that I
know of) to undo/redo the merge.
I've submitted work item 108903 ("Always place merge results in a
separate change set") to address this problem.
Until that's automated, my advice is to get in the habit of completing
the conflicting change sets before starting the merge (which forces the
merge to create a new change set).
Cheers,
Geoff
dlrostoc wrote:
My team received a support request from a user who suspended a change
set in their workspace to work on a more pressing issue. Upon
resuming the change set he had merge conflicts that needed to be
resolved. He accepted the auto merge results and they were checked
into the change set. He later discovered that the results of the
merge were incorrect. Can the merge operation be undone or replayed?
Should the results of the merge be checked into a new change set so
it can be reversed? How have others handled this situation?
Thanks,
-Dave