[Top][All Lists]

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

Re: Dynamic loading progress

From: Aurélien Aptel
Subject: Re: Dynamic loading progress
Date: Mon, 9 Nov 2015 11:40:06 +0100

On Sun, Nov 8, 2015 at 9:38 PM, Ted Zlatanov <address@hidden> wrote:
>>> Agreed. Aurélien, the diff is huge and there are many conflicts. It
>>> looks like the fork from master happened in February 2015 and you're
>>> simply out of date. Can you please rebase against the emacs.git
>>> origin/master?  Last push...

I already merged master in my branch at some point, and did so with
`merge --squash` IIRC, note to self: never do that again. Turns out it
made any subsequent master merge a lot harder, sorry for that. The
weird thing is most conflicting changes where actually identical but
git couldn't tell. The diff were the same on both side but git couldnt
tell they were from the same commits since they were squashed.

> PS> Please check
> PS> https://github.com/phst/emacs-dynamic-module/tree/dynamic-modules-2, it
> PS> should have the current master merged in.
> PS> Unfortunately I can't test that right now because for some reason make is
> PS> incredibly slow on my machine after the merge.
> Sorry, Philipp, I don't know how you and Aurélien have collaborated in
> the past, and I've considered Aurélien's code authoritative. I don't
> want to bypass his review and approval, so maybe you can work with him
> on that?  It will save us time instead of reviewing several times.

We've been working together on github, I've just merged his code.

reply via email to

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