From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Lars Ingebrigtsen <larsi@gnus.org>
Cc: Stefan Kangas <stefan@marxist.se>, Glenn Morris <rgm@gnu.org>,
emacs-devel@gnu.org
Subject: Re: Merging release branch
Date: Fri, 29 Oct 2021 15:00:39 -0400 [thread overview]
Message-ID: <jwvzgqrlkzn.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <87bl37vg9l.fsf@gnus.org> (Lars Ingebrigtsen's message of "Fri, 29 Oct 2021 20:26:46 +0200")
Lars Ingebrigtsen [2021-10-29 20:26:46] wrote:
> 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?
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).
Stefan
next prev parent reply other threads:[~2021-10-29 19:00 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-29 16:35 Merging release branch Glenn Morris
2021-10-29 16:42 ` Lars Ingebrigtsen
2021-10-29 17:01 ` Stefan Kangas
2021-10-29 18:10 ` Stefan Monnier
2021-10-29 18:26 ` Lars Ingebrigtsen
2021-10-29 18:52 ` Lars Ingebrigtsen
2021-10-29 19:55 ` Daniel Martín
2021-10-30 11:42 ` Lars Ingebrigtsen
2021-10-30 13:42 ` Daniel Martín
2021-10-30 20:32 ` Tassilo Horn
2021-10-29 19:58 ` Eli Zaretskii
2021-10-30 11:51 ` Lars Ingebrigtsen
2021-10-30 12:11 ` Eli Zaretskii
2021-10-30 12:30 ` Dmitry Gutov
2021-10-30 12:32 ` Eli Zaretskii
2021-10-30 13:34 ` dick
2021-10-31 11:38 ` Dmitry Gutov
2021-10-31 13:03 ` Eli Zaretskii
2021-10-30 16:33 ` Eli Zaretskii
2021-10-30 21:36 ` Dmitry Gutov
2021-10-31 7:19 ` Eli Zaretskii
2021-10-30 23:14 ` Gregory Heytings
2021-10-30 23:17 ` Dmitry Gutov
2021-10-31 7:20 ` Eli Zaretskii
2021-10-31 8:13 ` Gregory Heytings
2021-10-31 11:40 ` Dmitry Gutov
2021-10-31 12:58 ` Gregory Heytings
2021-10-31 21:59 ` Dmitry Gutov
2021-10-31 14:46 ` Lars Ingebrigtsen
2021-10-31 15:12 ` Eli Zaretskii
2021-10-31 15:15 ` Lars Ingebrigtsen
2021-10-31 16:02 ` Dealing with merge noise (was: Merging release branch) Kévin Le Gouguec
2021-10-31 18:19 ` Stefan Kangas
2021-10-31 18:31 ` Eli Zaretskii
2021-10-31 22:00 ` Merging release branch Dmitry Gutov
2021-10-30 12:31 ` Lars Ingebrigtsen
2021-10-30 12:48 ` Eli Zaretskii
2021-10-29 19:00 ` Stefan Monnier [this message]
2021-10-29 19:05 ` Lars Ingebrigtsen
2021-10-29 19:17 ` Stefan Monnier
2021-10-29 20:29 ` David Engster
2021-10-29 17:08 ` dick
2021-11-06 9:28 ` Eli Zaretskii
2021-11-06 10:53 ` Stefan Kangas
2021-11-06 16:14 ` Glenn Morris
2021-11-06 16:11 ` Glenn Morris
2021-11-06 17:19 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwvzgqrlkzn.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=emacs-devel@gnu.org \
--cc=larsi@gnus.org \
--cc=rgm@gnu.org \
--cc=stefan@marxist.se \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).