[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Problems merging NEWS for the nth time
|
From: |
Stefan Kangas |
|
Subject: |
Problems merging NEWS for the nth time |
|
Date: |
Sun, 22 May 2022 09:53:45 +0200 |
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
- Problems merging NEWS for the nth time,
Stefan Kangas <=