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

Re: [PATCH] vc-svn: vc-merge, avoid status checks

From: Robert Pluim <rpluim_at_bigfoot.com>
Date: 2003-03-19 17:24:50 CET

Stefan Monnier writes:
> > +You may need to run `svn resolve' by hand once these conflicts have
> > +been resolved."
>
> Why is that ?

Because you have to inform subversion that you've resolved the
conflicts, which can be done by running svn resolve, or by removing
the temporary files. 

-- 
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Mar 19 17:25:08 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.