From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id wL1VBI/5pl+zCwAA0tVLHw (envelope-from ) for ; Sat, 07 Nov 2020 19:46:23 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 2HskAI/5pl/LCgAAbx9fmQ (envelope-from ) for ; Sat, 07 Nov 2020 19:46:23 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id CB5509401CD for ; Sat, 7 Nov 2020 19:46:22 +0000 (UTC) Received: from localhost ([::1]:35764 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kbUAH-0007LL-R9 for larch@yhetil.org; Sat, 07 Nov 2020 14:46:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59230) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kbUA8-0007Kz-Vc for guix-devel@gnu.org; Sat, 07 Nov 2020 14:46:13 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:36173) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kbUA7-0001YJ-TK; Sat, 07 Nov 2020 14:46:11 -0500 Received: from host-37-191-236-253.lynet.no ([37.191.236.253]:60740 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kbUA7-0004LA-CO; Sat, 07 Nov 2020 14:46:11 -0500 From: Marius Bakke To: Pierre Neidhardt Subject: Re: branch master updated: gnu: nyxt: Update to 2-pre-release-3. In-Reply-To: <87ft5lgdmn.fsf@gnu.org> References: <20201020130843.10939.42161@vcs0.savannah.gnu.org> <87ft5lgdmn.fsf@gnu.org> Date: Sat, 07 Nov 2020 20:46:08 +0100 Message-ID: <87d00pgdbz.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: guix-devel@gnu.org Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: "Guix-devel" X-Scanner: ns3122888.ip-94-23-21.eu Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-devel-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-devel-bounces@gnu.org X-Spam-Score: -3.61 X-TUID: Smkd4ZQXWZow --=-=-= Content-Type: text/plain Marius Bakke writes: > This is a friendly reminder to please list all changes to inputs, > arguments etc in the commit message. It makes resolving merge conflicts > *much* easier. > > Due to SBCL changes on the 'staging' branch, there have been a few > changes to the 'nyxt' inputs; and because the changes from 'master' are > not mentioned in the commit messages, I need to manually look at each > commit and note what has changed in order to resolve the conflict. > > (feel free to try merging c2396ceb onto 052939c2 to get an idea of what > I'm talking about :-) If you happen to be around right now, can you confirm that there were no changes to nyxt inputs in 573489fbcd68e3a89cc5c9c66693d3689b1b88bf? --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFDBAEBCgAtFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl+m+YEPHG1hcml1c0Bn bnUub3JnAAoJEKKgbfKjOlT6yaIIAKwaOhAOFsFFd97x2+JVAF8aj2qN169l805p chmzM9woWk1/SJtaxuBuC5M3xXAXmL0XeE+AR7rJl4YxUD03DSLGdhV9zSwaYo7A yvNTLDynyt+Onr/acDqMptT3Tho5anPJebGhmPX//sjzvqlQ+UcvDMQStq691qBG nRl5s4li7BANsPFFBc0733l6fgoTZIAIzd54w2laSVXd2Rh8JvBYPuz+Zgl4E2ya FkESZfPPiJc5H7M3iOshR432n+euqDfbAfJHnQ9NPozoJKaWNrdRv187AsDvFSxY 9HKFseBmQ/5XkiZYqgvx7xl56NU9xkgBVy5rhu+Gbrf7nKX9fW0= =AMFO -----END PGP SIGNATURE----- --=-=-=--