Re: merging emacs-24

[David Engster]

Stefan Monnier writes:
>> Is it enough to merge laconically like you did:
> [...]
>> ...and resolve conflicts as needed?
>
> Yes.  Be careful with the conflicts, tho: some of those patches should
> simply not be applied (regardless if they'd create conflicts or not).
>
> You might prefer to wait for the gitmerge.el  to appear (I thought it
> was supposed to be done already, but I guess it's taking a bit more
> time than expected).

Seems like you overlooked this:

http://article.gmane.org/gmane.emacs.devel/178096

-David