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

Brian Denny writes:
> On Mon, Jun 09, 2003 at 11:06:45AM -0500, kfogel@collab.net wrote:
> >
> > $ svn unconflict
> >
> > seems like the best option so far. Anyone -1 on this, or have a
> > better idea?
>
> This is ok with me, but i wonder why there has been no discussion of
> sussman's suggestion to leave the command names as they are, and just
> leave behind a .mine file when reverting a conflict?

Hmm, ok. As long as it's a .mine.N if you svn revert more than once.

Robert

---------------------------------------------------------------------
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:52:03 2003