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

kfogel@collab.net writes:

> 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... :-) ).

Actually I think that's kind of nice. I also liked Sussman's
suggestion of 'svn settle'. Even though some knucklehead would at some
point ask, "what is a tle, and why does setting it fix the wc?"

Cheers,
-B.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jun 9 19:33:15 2003