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

[John Goerzen]

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.