Have you considered trying to improve the existing merge code to
address specific problems you are having, instead of rewriting
it or making substantial changes? I would guess that such an
approach could lead to improvements much sooner and would carry
less risk of destabilising the existing code base.

Have you considered how complex situations such as tree conflicts
will affect your design?

I am looking forward to seeing a prototype that implements your ideas.
Please feel free to ask questions on this list during design and
implementation of your prototype.
Received on 2011-07-11 18:01:50 CEST