[Top][All Lists]

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

[Gnu-arch-users] Re: --skip-present implemented

From: John Goerzen
Subject: [Gnu-arch-users] Re: --skip-present implemented
Date: Tue, 09 Sep 2003 16:58:31 -0500
User-agent: Gnus/5.1002 (Gnus v5.10.2) XEmacs/21.4 (Rational FORTRAN, linux)

Miles Bader <address@hidden> writes:

> I do `pure merges' from my auxilarly branches to my main branch, and
> then later want to just do a normal merge from the main branch to the
> aux branches, but star-merge always gets completely confused by the
> previous pure merges (and of course replay just gets conflicts).
> Now I can just do replay --skip-present to do the main->aux merges!

Can somebody explain to a tla newbie *why* star-merge gets confused
and how to fix it?  It seemed to me from reading the tutorial that
this is exactly the situation star-merge was supposed to fix.

reply via email to

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