From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id Pz0kNwz25WEAcgEAgWs5BA (envelope-from ) for ; Tue, 18 Jan 2022 00:04:44 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id EBY5Mgz25WEZigAA9RJhRA (envelope-from ) for ; Tue, 18 Jan 2022 00:04:44 +0100 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 B1D9717730 for ; Tue, 18 Jan 2022 00:04:44 +0100 (CET) Received: from localhost ([::1]:54624 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n9b3E-0002oD-9U for larch@yhetil.org; Mon, 17 Jan 2022 18:04:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56868) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9az1-0004Qd-JM for guix-devel@gnu.org; Mon, 17 Jan 2022 18:00:17 -0500 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:40309) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9ayz-0001z0-Jk for guix-devel@gnu.org; Mon, 17 Jan 2022 18:00:15 -0500 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id C4C9632008FA; Mon, 17 Jan 2022 18:00:09 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Mon, 17 Jan 2022 18:00:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=aoR22MfslpQ/TgcVqDcUSE0t XxsoNR6yV7LqjWKPxHM=; b=sNolkNJYjTsoVnA5X4aEzAs89osk0WWUPvyY94fQ NJhnTVfsDZyiTDXS0Dw1i5G9gnnZZ6ZwKdOwREULYM2NL8XGI+P16xG7lNOoqkNz ICRyp6Kd0PpgSIrztyky3PTLqcA4hvwLECXjMGeFbO2FEbKbD1CgF/j6hC6009+J Zlc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=aoR22M fslpQ/TgcVqDcUSE0tXxsoNR6yV7LqjWKPxHM=; b=LvAJzxrOfZ/kdaxj7KLXxR ocQ7eLYFmqb5uO/Ph7p34p4M+0E5kyABDlHhz1RI6ambeEwIWTQp0NApEsxzeMKg riRr4fQkmUCqHGGbV3jR8AAYVwVcgrX+dlqGJ0LcnjHPdexh0UNkn3kk6pkhyT+h S90hvNMEpQDe+/Wsbncy0DSsRxjAm91F1lvjy6ueenyYD3WZC9eUOWGymWoNxzja 5nr7H372IF07dVG7/xlvKNAtrgeRdzmL2MPiLvt4xGdusb9rCk0co7bVJw9l78Iu bIT0hNMYYY+JB0iiG876IyxS2CGUiJ/aXtulZKs8M5y2XyxThAubiCWpoXFAfUYw == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddruddvgddthecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpeffhffvuffkfhggtggujgesthdtredttddtvdenucfhrhhomhepnfgvohcuhfgr mhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhirdhnrghmvgeqnecuggftrfgrthhtvg hrnhepueekkedtffdvtddugeejgedtvefhueefiedvjeeitdeigedtveejvdejheffvefg necuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheplhgvoh esfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 17 Jan 2022 18:00:09 -0500 (EST) Date: Mon, 17 Jan 2022 18:00:07 -0500 From: Leo Famulari To: Kyle Meyer Subject: Re: WARNING: Git merges are tricky. Rebasing is better? Message-ID: References: <87fspmngn3.fsf@kyleam.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87fspmngn3.fsf@kyleam.com> Received-SPF: pass client-ip=64.147.123.24; envelope-from=leo@famulari.name; helo=wout1-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.29 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" Authentication-Results: aspmx1.migadu.com; none X-Migadu-Scanner: scn1.migadu.com X-TUID: 0LcP4v2ppSpr On Mon, Jan 17, 2022 at 05:26:08PM -0500, Kyle Meyer wrote: > Fwiw I don't think Git automatically resolved that conflict: > > $ git checkout 276f40fdc349d2ad62582b23ea55e061b689cfc0^ > $ git merge 276f40fdc349d2ad62582b23ea55e061b689cfc0^2 [...] > ++<<<<<<< HEAD > + "0r7m34xzz3shdfxf2abxb069izak3yv3ijlg29qy4pfmyawkilfs")) > + (patches > + (search-patches "epiphany-update-libportal-usage.patch")))) > ++||||||| d91de53caa > ++ "0r7m34xzz3shdfxf2abxb069izak3yv3ijlg29qy4pfmyawkilfs")))) > ++ > ++======= > + "0k7b22zq3z1kllzqxgwsvwb1lp0j6rjb3k1hvhna3i573wc4mpji")))) > + > ++>>>>>>> 276f40fdc349d2ad62582b23ea55e061b689cfc0^2 So, you think it was a mistake made when resolving conflicts by hand? I can certainly understand that. Either way, it's bad that the Git history doesn't show these types of changes.