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

Re: tree conflict: local add, incoming add upon merge

From: Stefan Sperling <stsp_at_elego.de>
Date: Tue, 24 May 2011 17:24:32 +0200

On Tue, May 24, 2011 at 05:05:43PM +0200, Stefan Sperling wrote:
> In short, whatever works for you is best :)

That said, our goal is to ultimately provide automated resolution
of trivial tree conflicts, and interactive menus for resolving more
complicated ones. The plumbing isn't yet advanced enough to allow
us to implement this, but we're working towards that and Subversion 1.7
is taking a great leap forward.

I tentatively expect some visible improvements to happen in Subversion 1.8.
Received on 2011-05-24 17:25:06 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.