Re: [RFC] v2 Tree conflict resolver spec.
From: Neels J Hofmeyr <neels_at_elego.de>
Date: Wed, 10 Feb 2010 02:17:05 +0100
Julian Foad wrote:
Hey, wait a minute. That's not true when there were local modifications
Merge tree-conflicts, when they are encountered, should change neither the
--accept=mine should then simply remove the conflict marker and done.
--accept=theirs should be identical to 'revert' plus pulling in 'their'
Or am I twisting things now?
I am thinking incrementally with merge. Local mods are allowed to exist
That's simple enough for a two-URL merge. But for a number of partitioned
Have I left orbit?
Still, I think it's quite insane to equal --accept=mine with a *revert*, of
This is an archived mail posted to the Subversion Dev mailing list.