From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: * X-Spam-Status: No, score=1.3 required=5.0 tests=RDNS_NONE autolearn=no autolearn_force=no version=3.4.4 Received: (qmail 23931 invoked from network); 26 Jul 2021 16:20:08 -0000 Received: from unknown (HELO 1ess.inri.net) (216.126.196.35) by inbox.vuxu.org with ESMTPUTF8; 26 Jul 2021 16:20:08 -0000 Received: from MTA-08-3.privateemail.com ([198.54.127.61]) by 1ess; Mon Jul 26 11:58:37 -0400 2021 Received: from mta-08.privateemail.com (localhost [127.0.0.1]) by mta-08.privateemail.com (Postfix) with ESMTP id 72C6F1800A4B for <9front@9front.org>; Mon, 26 Jul 2021 11:58:23 -0400 (EDT) Received: from localhost (unknown [10.20.151.222]) by mta-08.privateemail.com (Postfix) with ESMTPA id 8A0B51800185 for <9front@9front.org>; Mon, 26 Jul 2021 11:58:22 -0400 (EDT) Date: Mon, 26 Jul 2021 08:58:14 -0700 From: Anthony Martin To: 9front@9front.org Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Virus-Scanned: ClamAV using ClamSMTP List-ID: <9front.9front.org> List-Help: X-Glyph: ➈ X-Bullshit: SQL over ActivityPub standard descriptor-oriented framework Subject: [9front] Re: sysupdate: no common ancestors Reply-To: 9front@9front.org Precedence: bulk Stuart Morrow 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