Re: Merging release branch

[Lars Ingebrigtsen]

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