On Fri, Dec 18, 2009 at 04:39:23PM -0500, Bob Archer wrote:
> Ok, I'm gonna go out here on a limb (get it tree conflict, limb,
> anyway) and say that auto conflict resolution doesn't apply to a tree
> conflict. I think to resolve a tree conflict you have to manually make
> the tree in the merge tar
> > -Original Message-
> > > I am using Subversion 1.6.5 r38866 on Ubuntu 9.10 (my $SHELL is
> > > /bin/bash). Trying to use merge and have it automatically
> accept
> > > my changes during conflicts by issuing:
> > > svn merge --accept mine-full -c 12345
> > https://repository/branches/
> -Original Message-
> From: Bob Archer [mailto:bob.arc...@amsi.com]
> Sent: Friday, December 18, 2009 2:53 PM
> To: Siefert, David; users@subversion.apache.org
> Subject: RE: merge does not allow --accept argument
>
> > I am using Subversion 1.6.5 r38866 on U
> I am using Subversion 1.6.5 r38866 on Ubuntu 9.10 (my $SHELL is
> /bin/bash). Trying to use merge and have it automatically accept
> my changes during conflicts by issuing:
> svn merge --accept mine-full -c 12345
> https://repository/branches/blah/blah/blah
The above looks right.
> also
Hi All,
I am using Subversion 1.6.5 r38866 on Ubuntu 9.10 (my $SHELL is /bin/bash).
Trying to use merge and have it automatically accept my changes during
conflicts by issuing:
svn merge --accept mine-full -c 12345
https://repository/branches/blah/blah/blah
also tried the following var
