Re: Standard setup for multiple branch merges?

On Fri, 2004-07-23 at 14:56, Ben Collins-Sussman wrote:

> > >find -type f | xargs grep '>>>>>>>'
> > > # fix conflicts... (remember to use svn resolved for each)

By the way, this is not the way to find conflicts in Subversion. Just
run 'svn status' and look for (C)onflicted files.

And I sure hope you're not depending on a script to fix the conflict
markers. :-)

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jul 23 22:05:43 2004