From: Eli Zaretskii <eliz@gnu.org>
To: Yuan Fu <casouri@gmail.com>
Cc: stefankangas@gmail.com, emacs-devel@gnu.org
Subject: Re: Moving etc/NEWS around causing release branch merge to fail again
Date: Sun, 01 Jan 2023 08:30:29 +0200 [thread overview]
Message-ID: <83a6324vi2.fsf@gnu.org> (raw)
In-Reply-To: <2955FDDC-828C-4EC7-A250-FB7E67850DA5@gmail.com> (message from Yuan Fu on Sat, 31 Dec 2022 14:42:35 -0800)
> From: Yuan Fu <casouri@gmail.com>
> Date: Sat, 31 Dec 2022 14:42:35 -0800
> Cc: Eli Zaretskii <eliz@gnu.org>,
> emacs-devel@gnu.org
>
> Do I need to do anything special when editing the NEWS file on emacs-29? Doesn’t seem like it but just want make sure.
No, editing NEWS on the emacs-29 branch doesn't need anything special.
The problems happen on master, not on the branch. On master, we
should never edit the NEWS.NN files from past versions, and especially
not the one from the current release branch, on which we routinely
make changes to the corresponding NEWS.
next prev parent reply other threads:[~2023-01-01 6:30 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-08 15:49 Moving etc/NEWS around causing release branch merge to fail again Stefan Kangas
2022-12-08 18:08 ` Eli Zaretskii
2022-12-08 22:20 ` Stefan Kangas
2022-12-13 23:34 ` Stefan Kangas
2022-12-14 3:42 ` Eli Zaretskii
2022-12-14 5:32 ` Stefan Kangas
2022-12-14 16:01 ` Eli Zaretskii
2022-12-31 22:42 ` Yuan Fu
2023-01-01 6:30 ` Eli Zaretskii [this message]
2023-01-01 23:23 ` Yuan Fu
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=83a6324vi2.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=casouri@gmail.com \
--cc=emacs-devel@gnu.org \
--cc=stefankangas@gmail.com \
/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).