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

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

> If `emacs-28` was already merged before your commit(s), then it's
> a small matter of going back to the main branch and doing `git merge
> emacs-28` or `git merge -s ours emacs-28`.

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

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