From: Anthony Martin <ality@pbrane.org>
To: 9front@9front.org
Subject: [9front] Re: sysupdate: no common ancestors
Date: Mon, 26 Jul 2021 08:58:14 -0700 [thread overview]
Message-ID: <YP7blhdlFixPhawu@alice> (raw)
In-Reply-To: <CABB-WO-DoKmFJZ-pokzkaFMsHA_6Eah0VR2dbUH8ThY8B12oMw@mail.gmail.com>
Stuart Morrow <morrow.stuart@gmail.com> once said:
> % sysupdate
> git/query: resolve: no common ancestor
> git/query: resolve: no common ancestor
> ours: 403149d7de4dbe4cc4b1fd9cb3a164e51dbccc15
> theirs: 28f76455d39d990b47c6e46e18158f0a9ba09d25
> git/query: resolve: no common ancestor
> common:
> git/merge remotes/THEM/front
Note that git/fetch didn't print "fetching..." so
those newer refs and objects (from your logs) must
have been received in a previous fetch. What was
the state of your repository before this sysupdate?
Something dodgy is going on here.
Cheers,
Anthony
next prev parent reply other threads:[~2021-07-26 16:20 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-25 20:12 [9front] " Stuart Morrow
2021-07-25 20:20 ` ori
2021-07-25 20:42 ` Stuart Morrow
2021-07-25 22:40 ` Anthony Martin
2021-07-26 15:58 ` Anthony Martin [this message]
2021-07-26 17:34 ` [9front] " Stuart Morrow
2021-07-27 0:07 ` Anthony Martin
2021-07-27 1:04 ` ori
2021-07-27 2:28 ` ori
2021-07-27 10:47 ` Stuart Morrow
2021-07-27 10:53 ` Stuart Morrow
2021-07-27 14:44 ` ori
2021-07-29 19:51 ` Stuart Morrow
2021-07-29 22:13 ` ori
2021-07-31 19:59 ` Stuart Morrow
2021-08-01 23:34 ` ori
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=YP7blhdlFixPhawu@alice \
--to=ality@pbrane.org \
--cc=9front@9front.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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).