On 01/04/2010 01:25 PM, Stefan Sperling wrote:
> 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.
If it doesn't resolve them (any? all?) yet, then this would explain one
of the results I saw and couldn't explain. It knew the files had moved,
it said it completed the merge - but the merge was missing. I became too
busy to chase it down! :-(
Received on 2010-01-04 19:45:46 CET