Re: Fixing merge - Subtree, Cyclic, and Tree Change cases

[Julian Foad]
> In fact, this must imply that you *can* get conflicts if any of the
> changes on trunk after rX conflicts with the "feature". But the
> recommended work flow would be to do the last "catch-up" (which
> defines X) just before the re-integrate, so the opportunity for such
> conflicts would be small.

Indeed. I don't usually bother with a "final catch-up merge". I
just do the reintegrate with wherever the branch happens to be.
The conflicts will be pretty much the same, and it's one less step.

The only valid argument for a 'final catch-up' that I can think of is
if the final --reintegrate merge is to be performed by somebody else,
or has some sort of formal QA process around it, such that it is
advantageous to resolve the conflicts ahead of time, in a separate
step, to keep the final step simple and deterministic. But typically,
I reintegrate my own branches, so I prefer to skip the extra step and
the extra rev.

-- 
Peter Samuelson | org-tld!p12n!peter | http://p12n.org/