Re: [Monotone-devel] merge conflicts

[Stephen Leake]

On Fri, Dec 11, 2009 at 6:20 AM, Thomas Keller <address@hidden> wrote:

>> $ mtn automate show_conflicts -b your.branch LEFT RIGHT
>>
>> Unfortunately the show_conflicts command isn't very useful to use before
>> you merge, because it might report f.e. content conflicts which the
>> internal monotone line merger might be perfectly able to resolve on its own.

This suggests an enhancement option: '--no-resolved-internal', to
exclude such conflicts from the show_conflicts output.

That would require calling the internal merger to see if it succeeds,
when listing the conflicts. That's not hard.

-- 
-- Stephe