[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 21:05:07 +0200
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux)

Stefan Monnier <monnier@iro.umontreal.ca> writes:

> That's what `git merge -s ours emacs-28` does (it marks the commit as
> merged but without bringing any of the corresponding code changes).

Oh, I see.  But what if there was some other commit in emacs-28 that
that committer had forgotten to merge?  Then it would also be kept out
of master?

Your assumption here was that emacs-28 had already been merged, but I
think people would be likely to forget.

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