[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: merging emacs-24

From: David Engster
Subject: Re: merging emacs-24
Date: Wed, 26 Nov 2014 20:02:22 +0100
User-agent: Gnus/5.13001 (Ma Gnus v0.10) Emacs/24.3.91 (gnu/linux)

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:



reply via email to

[Prev in Thread] Current Thread [Next in Thread]