[Top][All Lists]

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

Re: I just pushed master into emacs-27

From: Lars Ingebrigtsen
Subject: Re: I just pushed master into emacs-27
Date: Thu, 30 Jul 2020 02:28:03 +0200
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux)

Nicolas Petton <nico@petton.fr> writes:

> I just realized that I pushed master into the emacs-27 branch... I must
> have rebased against master out of habit, like I always do on some other
> git repositories.
> I'm really sorry about this, it has made a big mess in the emacs-27
> branch.

Oops.  My sympathies.

But perhaps this isn't really that serious...  I mean, if it had been
master, then that would have been a different story, but this is just on
a branch, so the history there isn't really that big a deal, so you can
just revert the whole thing?

If the history is important, would it make sense, for instance, just to
make a emacs-27-2 branch starting from just before the merge and then
continue off of that?

(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

reply via email to

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