[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Monotone-devel] merge conflicts

From: Thomas Keller
Subject: Re: [Monotone-devel] merge conflicts
Date: Sat, 12 Dec 2009 18:31:06 +0100
User-agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; de; rv: Gecko/20091130 Lightning/1.0b1pre Thunderbird/3.0

Am 12.12.09 08:56, schrieb 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.

Hi Stephe!

If you're up for that job, then great, just go ahead! But are you really
sure this should be an additional option and not the default...?


GPG-Key 0x160D1092 | address@hidden |
Please note that according to the EU law on data retention, information
on every electronic information exchange might be retained for a period
of six months or longer:

Attachment: signature.asc
Description: OpenPGP digital signature

reply via email to

[Prev in Thread] Current Thread [Next in Thread]