Re: resolving tree conflicts

On Tue, Jul 14, 2009 at 01:31:07PM +0100, James French wrote:
> Thanks Stefan. That is very clear. However, unfortunately I wasn't
> very clear! I really want, if possible, to do this in a single commit
> so I don't break it for everyone else while I do the merge, and for
> the sheer principle of the thing. Is this possible somehow?

You can merge into a working copy with local modifactions.
So yes, it should be possible. Move all files and directories
around first, then do the merge. Then check if the end result
is what you wanted, then commit.

> Another
> idea could be to create a temporary branch off the trunk, do the
> moves, do the merge and then reintegrate - would this work?

No, because you will have the exact same problem as you have now :)
To avoid tree conflicts, the refactoring needs to happen where you
are merging *to*. It has already happened where you are merging *from*.

Stefan
Received on 2009-07-14 14:41:38 CEST