emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: flymake-proselint has diverged


From: Manuel Uberti
Subject: Re: flymake-proselint has diverged
Date: Sun, 10 Apr 2022 07:07:46 +0200
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0

On 10/04/22 01:26, Stefan Monnier wrote:
Hi Manuel,

Hi Stefan

We have a problem with `flymake-proselint` on GNU ELPA because the code
in `elpa.git` has diverged from that in the upstream:

     % make fetch/flymake-proselint
     emacs --no-site-lisp --batch -l admin/elpa-admin.el -f elpaa-batch-fetch-and-show 
"flymake-proselint"
     Fetching updates for flymake-proselint...
     Upstream of flymake-proselint has DIVERGED!
Local changes:
     1d240a7b69  manuel-uberti@..  Move to SourceHut
Upstream changes:
     2031f3df76  manuel.uberti@..  Update format
     de88c00d8b  manuel.uberti@..  Update URL
%

The GNU ELPA code can only be updated via fast-forward, so could you
please merge commit 1d240a7b69 into your upstream?

Thank you for spotting this. I merged the commit and pushed the change, hopefully without getting it wrong.

Let me know if you need me to do something else. My git-fu is rather limited.

--
Manuel Uberti
https://manueluberti.eu



reply via email to

[Prev in Thread] Current Thread [Next in Thread]