[Top][All Lists]

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

Re: Merging release branch

From: Lars Ingebrigtsen
Subject: Re: Merging release branch
Date: Fri, 29 Oct 2021 20:52:22 +0200
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux)

Lars Ingebrigtsen <larsi@gnus.org> writes:

> That work flow sounds fine to me in general -- but what about those
> changes to emacs-28 that shouldn't be merged?

I know there's other projects that don't do merging at all between
long-lived branches like this.

In Emacs, that would mean that things that are supposed to be
emacs-28-only are developed there, and are pushed as normal.  Any things
that are supposed to go to both master and emacs-28 are committed to
master, and then cherry-picked for emacs-28.  (Or cherry-picked the
other way, but that risks "losing" changes if you forget.)

Doing it that way would involve much fewer special rules (about commit
message formats) and less magic.

(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]