Re: Merging release branch

[Stefan Monnier]

> Another idea is that other people could proactively merge, if they
> suspect that their changes might cause conflicts.  (I haven't done so,
> for fear of stepping on your toes, but I would be happy to start.)

I think we should get in the habit of merging proactively, indeed.
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`.


        Stefan