[Top][All Lists]

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

Re: [Monotone-devel] improving show_conflicts

From: Stephen Leake
Subject: Re: [Monotone-devel] improving show_conflicts
Date: Thu, 21 Feb 2008 07:26:24 -0500
User-agent: Gnus/5.1006 (Gnus v5.10.6) Emacs/22.1 (windows-nt)

Stephen Leake <address@hidden> writes:

> Derek Scherger <address@hidden> writes:
>> Alternatively, update --dry-run and merge --dry-run (or --pretend or
>> --test or whatever)
> Given the behavior of merge for N > 2, I think this makes much more
> sense. 

On the other hand, for automate, commands should do small operations,
so show_conflicts --merge would be better. I'll have to look at the
code for more insight.

-- Stephe

reply via email to

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