unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
* Problems merging NEWS for the nth time
@ 2022-05-22  7:53 Stefan Kangas
  2022-05-22  8:23 ` Eli Zaretskii
  0 siblings, 1 reply; 2+ messages in thread
From: Stefan Kangas @ 2022-05-22  7:53 UTC (permalink / raw)
  To: Emacs developers

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



^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: Problems merging NEWS for the nth time
  2022-05-22  7:53 Problems merging NEWS for the nth time Stefan Kangas
@ 2022-05-22  8:23 ` Eli Zaretskii
  0 siblings, 0 replies; 2+ messages in thread
From: Eli Zaretskii @ 2022-05-22  8:23 UTC (permalink / raw)
  To: Stefan Kangas; +Cc: emacs-devel

> From: Stefan Kangas <stefan@marxist.se>
> Date: Sun, 22 May 2022 09:53:45 +0200
> 
> There are problems with merging NEWS again, and manual intervention is needed.

Let me know if you need help with that.

Thanks.



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-05-22  8:23 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-22  7:53 Problems merging NEWS for the nth time Stefan Kangas
2022-05-22  8:23 ` Eli Zaretskii

Code repositories for project(s) associated with this 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).