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

On Wed, Jul 20, 2011 at 03:27:02PM +0100, Julian Foad wrote:
> Stefan Sperling wrote:
> > It does not generate conflicts because of the way REV1 is chosen,
> > and because of the way PATH1 and PATH2 are chosen.
>
> 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.

Yes, precisely. Thanks for correcting this point.
Received on 2011-07-20 16:31:01 CEST