[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: flymake-proselint has diverged
|
From: |
Stefan Monnier |
|
Subject: |
Re: flymake-proselint has diverged |
|
Date: |
Sun, 10 Apr 2022 01:33:01 -0400 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) |
Manuel Uberti [2022-04-10 07:07:46] wrote:
> Thank you for spotting this. I merged the commit and pushed the change,
> hopefully without getting it wrong.
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`?
Stefan