[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: Sat, 30 Oct 2021 13:42:47 +0200
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux)

Daniel Martín <mardani29@yahoo.es> writes:

> But this workflow is not exent of problems, though, because at the time
> you cherry-pick it's possible that the change doesn't apply cleanly to
> the emacs-28 branch.  In that case, you'll need to adapt the patch, and
> possibly a maintainer would potentially need to review it again to see
> if it's still safe enough for the release branch.

Well, we depend upon people making that decision already -- when they're
putting things into emacs-28 or master.  

> The merging work is distributed across the people that cherry-pick
> their commits if they are deemed safe for the next release.

That's one of the things I find really attractive about the
cherry-picking work flow: Offloading the (boring) merging work on Glenn
has never felt very fair -- the person doing the commit should also do
the merges (not least because they're the ones that know best what the
change is meant to achieve).

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