change/delete conflicts and explicit merge tools

Pierre-Yves David pierre-yves.david at ens-lyon.org
Fri Nov 13 21:31:47 CST 2015



On 11/13/2015 07:23 PM, Siddharth Agarwal wrote:
> On 11/13/15 17:17, Pierre-Yves David wrote:
>>
>> I agree that the current behavior (a) is broken, we should not just
>> pick a random side and declare the merge successful.
>>
>> +1 for "leave unresolved"
>>
>> I think I lean toward (c) prompt instead of (b) fail. Because
>> requiring all user to got through `hg resolve --tool` seems like bad
>> idea. This seems far to complicated to get basic user out of troubles,
>> we'll loose people in the process.
>
> So for interactive merges we continue to prompt, and for non-interactive
> merges we prompt but then say 'l' for 'leave unresolved'. This is still
> a behavior change, but likely one for the better.

Default for interractive would be "leave unresolved", non-interractive 
pick the default.

-- 
Pierre-Yves David


More information about the Mercurial-devel mailing list