[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Merging release branch

From: Stefan Monnier
Subject: Re: Merging release branch
Date: Fri, 29 Oct 2021 14:10:11 -0400
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux)

> 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`.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]