[Top][All Lists]

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

Re: [Gnu-arch-users] NEW: three-way merges / conflict markers

From: Robert Collins
Subject: Re: [Gnu-arch-users] NEW: three-way merges / conflict markers
Date: Sun, 21 Sep 2003 07:51:23 +1000

On Sun, 2003-09-21 at 03:45, Tom Lord wrote:

> It's probably worth pointing out that `star-merge', especially with
> the `-t' option, is an alternative to both `update' and `replay' for
> catching up to changes in your default tree version.  In other words,
> there isn't a real reason to add a `-t' option to `update' or `replay'
> -- just use `star-merge' instead.  (On the other hand, I wouldn't
> reject patches that turn `update -t' and `replay -t' into a call to
> `star-merge'.)

Trying to skill skip-present by stealth? There certainly is a call for
-t to replay, unless you've added star-merge --skip-present while my
back was turned..

GPG key available at: <>.

Attachment: signature.asc
Description: This is a digitally signed message part

reply via email to

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