Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NonGNU ELPA is not following upstream any more #671

Open
monnier opened this issue Nov 22, 2024 · 0 comments
Open

NonGNU ELPA is not following upstream any more #671

monnier opened this issue Nov 22, 2024 · 0 comments

Comments

@monnier
Copy link

monnier commented Nov 22, 2024

The NonGNU ELPA scripts failed to synchronize with the upstream version
because the two have diverged. This is usually the result of an
overly-optimistic force-push. Please refrain from using force-push
on such public branches.

The archive will not be able to track your code until you resolve this
problem by (re?)merging the code that's in "emacs/nongnu.git". You can do that
with the following commands:

git fetch https://git.sv.gnu.org/git/emacs/nongnu.git elpa/meow
git merge FETCH_HEAD

Of course, feel free to undo the changes it may introduce in the file
contents: we only need the metadata to indicate that this commit was merged.

You can consult the latest error output in
the sync-failure file.

The current error output was the following:

Upstream of meow has DIVERGED!

  Local changes:
38af7f1d23 2024-11  doglooksgood@h..  Lower the priority of normal keymap and remove some shims (#664)

  Upstream changes:
4a9297d698 2024-11  leon.errelin@o..  Simplify the default `meow-mode-state-list` (#670)
c0985b3531 2024-11  daniel.arnqvis..  Add eat-eshell shim (#668)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant