On Wed, Jul 6, 2011 at 12:35 PM, Stefan Sperling wrote:
> On Wed, Jul 06, 2011 at 12:23:25PM -0400, Paul Burba wrote:
>> One alternative would be to stop nesting conflicts if merge tracking
>> is active and treat existing conflicts as obstructions. Using the
>> existing merge tracking infrastruct
On Wed, Jul 06, 2011 at 12:23:25PM -0400, Paul Burba wrote:
> One alternative would be to stop nesting conflicts if merge tracking
> is active and treat existing conflicts as obstructions. Using the
> existing merge tracking infrastructure for marking skipped subtrees as
> untouched by a merge, we
On IRC Bert has asked me on a couple occasions if merge tracking
should treat exiting conflicts as obstructions. In 1.6 and currently
in trunk, if an existing conflict is encountered during a merge we
raise another conflict. For example:
1) We perform a merge that results in a conflict:
1.7.0
3 matches
Mail list logo
