Surley (?) the simplest method, given your limited number of branches,
is to capture and repeat the moves as a script once for each branch, so
that each branch has a flag day commit. Then the development merging
should proceed just fine.

At least then the file rename machinery has much less to worry about for
any (real) conflicts that may happen. It will normally show the file
renames just in case..

To my surprise, this caused conflicts for quasi every of the affected
11000 files as
well. Unfortunately I didn't keep a copy of the exact messages, but
essentially the
reported conflict was that the file has been renamed on one side, and
has been renamed

on the other side as well.
What can we do?
Best regards,
Carsten
--
Cafu - the open-source Game and Graphics Engine
for multiplayer, cross-platform, real-time 3D Action
Learn more at http://www.cafu.de
--
-----
No virus found in this message.
Checked by AVG - www.avg.com