subversion-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Stefan Sperling <s...@elego.de>
Subject Re: Subversion in 2010
Date Mon, 04 Jan 2010 18:25:05 GMT
On Mon, Jan 04, 2010 at 01:01:14PM -0500, Mark Mielke wrote:
> Again, I appreciate the unique difficulties that the Subversion
> architecture introduces, and I appreciate the efforts done so far -
> merge tracking in 1.5, tree conflict resolution in 1.6 - but this
> area still needs work.

I'd be really happy if we already had tree conflict resolution!
Right now, Subversion can *detect* tree conflicts, but it is far
from resolving any of them automatically.

Stefan

Mime
View raw message