unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Stefan Kangas <stefan@marxist.se>
To: Emacs developers <emacs-devel@gnu.org>
Subject: Problems merging NEWS for the nth time
Date: Sun, 22 May 2022 09:53:45 +0200	[thread overview]
Message-ID: <CADwFkmmSmM_RvxFF5i0=Q0drunV564dZRu9AWN0PhicGqb+_1A@mail.gmail.com> (raw)

There are problems with merging NEWS again, and manual intervention is needed.

$ ./admin/automerge -b -t -p -n1 -r
Resetting...
Pulling...
Merging...
Finding missing commits...
Finding missing commits...done
Merging af1c05..b05d1e
There are unresolved conflicts in lisp/abbrev.el
There are unresolved conflicts in etc/NEWS
Failed to fix NEWS conflict
Conflicts in:
etc/NEWS
lisp/abbrev.el

Resolve the conflicts manually
automerge: merge error



             reply	other threads:[~2022-05-22  7:53 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-22  7:53 Stefan Kangas [this message]
2022-05-22  8:23 ` Problems merging NEWS for the nth time 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='CADwFkmmSmM_RvxFF5i0=Q0drunV564dZRu9AWN0PhicGqb+_1A@mail.gmail.com' \
    --to=stefan@marxist.se \
    --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 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).