Re: flymake-proselint has diverged

[Manuel Uberti]

On 10/04/22 07:33, Stefan Monnier wrote:
> Looks like you applied an "identical" change rather than merging the
> actual commit:
>
>      % 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:
>      42b3ffa259  manuel-uberti@..  Move to SourceHut
>      2031f3df76  manuel.uberti@..  Update format
>      de88c00d8b  manuel.uberti@..  Update URL
>      
>      %
>
> IOW maybe you used `rebase` rather then `merge`?

Yep, sorry, as I said my git-fu is rather limited. I tried again, this 
time step-by-step with git merge.

--
Manuel Uberti
https://manueluberti.eu