[Aquamacs-devel] Bidi issues in Aquamacs24 branch

[David Reitter]

On Jul 5, 2010, at 6:43 PM, Ze'ev Clementson wrote:
> So when you do a merge from emacs24, are you manually resolving the
> discrepancies between the emacs code and your custom code?

Yes.  I do "git merge emacs24" and resolve conflicts (there are many), usually using "git mergetool".  Same for "git merge master" to merge in changes on the master branch.

Of course this is a bit tricky, and I am afraid that errors will creep up during that process.

> Also, are the changes maintained in any publicly-accessible repository?

Yes, of course.  All code is in the Aquamacs git repository; the nightly builds are only produced from code in these branches.

The changes are direct changes to the code; we do not have "patch sets", even though you could of course extract such patch sets with git quite easily.

Hope that helps, and that you can figure this out.

--
http://aquamacs.org -- Aquamacs: Emacs on Mac OS X
http://aquamacs.org/donate -- Could we help you? Return the favor and support the Aquamacs Project!