RE: undoing a merge

> > Isn't there a small gotcha here? If parts of his local
> changes matched
> > the changes from the new version, then wouldn't those be lost?
>
> That's true, yes!

Damn.

So, are we classifying loss of code as a "small gotcha" now?

My developers have requested that they be able to undo a harmful merge. I
have already emailed them outlining the procedure, but I must now retract.

Are there plans for a way to undo unwanted merges? We just need a backup of
the original modified wc file in its pre-merged state.

--- Eric

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Dec 19 18:08:37 2003