Re: merge does not allow --accept argument

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 target match the merge source. I don't think svn
> can or will do that for you automatically.

That is correct. Right now, svn can *detect* tree conflicts.
Resolving them automatically is another can of worms, and it may not
be possible at all to auto-resolve some of the more complicated kinds
of tree conflicts.

But we are starting to look into it, see
http://mail-archives.apache.org/mod_mbox/subversion-dev/200912.mbox/%3C20091202075300.GB7072@daniel-laptop%3E

Stefan
Received on 2009-12-19 15:24:35 CET