Hi Philip,

Am 2013-01-08 00:02, schrieb Philip Oakley:
That is, do I understand correctly that if I had used the default merge 
strategy, and
somehow solved all the conflicts (so that none of the files had been changed 
from F),
the result would have technically been exactly the same?

Obviously/hopefully your solution to any conflicts would have ended up being an 
choice anyway... Given that you already had a recent merge before the 
restructuring I
would expect that it would be exactl;y the same!

Ok, things seem to work very well: I'm not ready yet to test if *future* commits on the two branches, and future merges among them, will work as expected, but it looks as if everything worked out exactly as hoped. :-)

Philip, thank you very much for your help!

Best regards,

   Cafu - the open-source Game and Graphics Engine
for multiplayer, cross-platform, real-time 3D Action
          Learn more at http://www.cafu.de


Reply via email to