Re: 'svn revert' vs. 'svn resolve'

Okay, I reverted the 'svn undo' change, thanks for all the feedback.

My favorite solution now would be to rename 'svn resolve' instead, as
some have suggested, since 'resolve' has never been all that intuitive
anyway, and changing the name beats littering the wc with safety
files, IMHO. Ungainly as it is,

   $ svn unconflict

seems like the best option so far. Anyone -1 on this, or have a
better idea?

(There's also 'svn harmonize', but I guess that'd never fly... :-) ).

-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jun 9 18:52:26 2003