From: Stefan Kangas <stefankangas@gmail.com>
To: emacs-devel@gnu.org
Subject: Moving etc/NEWS around causing release branch merge to fail again
Date: Thu, 8 Dec 2022 07:49:48 -0800 [thread overview]
Message-ID: <CADwFkmk7xEKqVsZfDb_oJNKZTh+_QnYsHYFD8YbjuphzRB+diA@mail.gmail.com> (raw)
Merging the release branch is failing due to our practice of moving
etc/NEWS around again. Here's what I see:
$ ./admin/automerge -r -n 1 -b -t -p
Resetting...
Pulling...
Merging...
merged ok
automerge: etc/NEWS has been modified
I'll see if I can find the time and energy to investigate this today,
but otherwise it might be a couple of days until I'll merge emacs-29 to
master again. If anyone knows what's going on, please fix it or even
better tell me which steps to take.
next reply other threads:[~2022-12-08 15:49 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-08 15:49 Stefan Kangas [this message]
2022-12-08 18:08 ` Moving etc/NEWS around causing release branch merge to fail again 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
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CADwFkmk7xEKqVsZfDb_oJNKZTh+_QnYsHYFD8YbjuphzRB+diA@mail.gmail.com \
--to=stefankangas@gmail.com \
--cc=emacs-devel@gnu.org \
/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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.