Settings and activity
1 result found
-
1 vote
An error occurred while saving the comment An error occurred while saving the comment 
Johan
commented
Well, not really.
What you describe works as long as I realize I've done a mistake while undergoing the merge.But what if I've gone through the pending merge, saved it, and want to restart is afterwards. I want to say "undo the merge (restore the previous state) and merge again, from the beginning".
I can't just undo and merge again, since I then undo all my changes as well and they are lost (correct?). I can't just shelve, undo, restore the shelve and then merge again, since the shelve will contain the results of the merge, which are the ones I might want to redo.
Is that clearer? I understand this is a quite specific situation, but I believe it'll help new users quite a bit
Johan
shared this idea
·
Hi Pablo
Yes, you understood correctly. My scenario is after the merge has been completed already.
Restarting merge for one file would be useful, but it might be even more useful to be able to selected the pending merge link in the pending changes view, and select "redo this merge"
Yes, that is a tricky case, and I'm sure there are even more that neither you nor me have thought of. Support for this sort of thing would of course come with a bunch of limitations, unless you figure out some super smart way to do it. But isn't it the case that the resulting merge has knowledge of the workspace content contra the source changes from the server? I believe when selecting to restart a merge, I would expect it to let me merge my local changes with the changes from the server, regardless of how I've merged it previously.
But yes, tihs would require some thought indeed