Re: On the subject of Git, Bazaar, and the future of Emacs development

[Stefan Monnier]

>> The core of the problem is bidirectional merging.  
> If I understand what you mean by "bidirectional merging", then monotone
> handles it nicely (http://www.monotone.ca/).

By bidirectional merging, I mean that you have two parallel branches
that should be kept in sync, so that any commit on branch A should be
sync'd to branch B and vice versa.  Yet branch A and branch B are not
identical (there's a "constant" diff between the two).


        Stefan