From: Stuart Morrow <morrow.stuart@gmail.com>
To: 9front@9front.org
Subject: [9front] sysupdate: no common ancestors
Date: Sun, 25 Jul 2021 20:12:25 +0000 [thread overview]
Message-ID: <CABB-WO-DoKmFJZ-pokzkaFMsHA_6Eah0VR2dbUH8ThY8B12oMw@mail.gmail.com> (raw)
Yesterday's error was different: invalid ref. Obviously related, but I
don't know what caused yesterday's.
I don't want to look into the code when, tbh, I barely even understand
the concepts.
By the same token, there's no poking around in .git I could have done
to cause this. Came out of the blue.
Anyone know what's going on?
% 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
I find the multiple prints of the same error, always interleaved with
the other stuff in the same order, curious. Invalid ref was like that
too.
next reply other threads:[~2021-07-25 20:17 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-25 20:12 Stuart Morrow [this message]
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 ` [9front] " Anthony Martin
2021-07-26 17:34 ` 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=CABB-WO-DoKmFJZ-pokzkaFMsHA_6Eah0VR2dbUH8ThY8B12oMw@mail.gmail.com \
--to=morrow.stuart@gmail.com \
--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).