[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: <kfogel_at_collab.net>
Date: 2003-06-09 18:06:45 CEST

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


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

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.