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

[Stephen Leake]

Stefan Monnier <address@hidden> writes:

>>> Well, I don't believe that git will make cross-project merges easier, at
>>> least not until someone shows me how (and don't just say "submodules",
>>> please ;-) ).
>> I'm pretty sure it does make this easier:
>>     http://git-scm.com/book/en/Git-Tools-Subtree-Merging
>
> 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/).

I use monotone for all my projects, and merge back and forth between
branches all the time.

-- 
-- Stephe