From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Manuel Uberti <manuel.uberti@inventati.org>
Cc: emacs-devel@gnu.org
Subject: Re: flymake-proselint has diverged
Date: Sun, 10 Apr 2022 01:33:01 -0400 [thread overview]
Message-ID: <jwv4k31jyig.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <55179671-238c-c78b-4938-0790e192e688@inventati.org> (Manuel Uberti's message of "Sun, 10 Apr 2022 07:07:46 +0200")
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
next prev parent reply other threads:[~2022-04-10 5:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-09 23:26 flymake-proselint has diverged Stefan Monnier
2022-04-10 5:07 ` Manuel Uberti
2022-04-10 5:33 ` Stefan Monnier [this message]
2022-04-10 5:43 ` Manuel Uberti
2022-04-10 14:17 ` Stefan Monnier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwv4k31jyig.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=emacs-devel@gnu.org \
--cc=manuel.uberti@inventati.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.