From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id GL3nJLz55WGhIgAAgWs5BA (envelope-from ) for ; Tue, 18 Jan 2022 00:20:28 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id 8PpvHbz55WHSywAAG6o9tA (envelope-from ) for ; Tue, 18 Jan 2022 00:20:28 +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 417CF20547 for ; Tue, 18 Jan 2022 00:20:28 +0100 (CET) Received: from localhost ([::1]:39430 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n9bIZ-0003kM-GR for larch@yhetil.org; Mon, 17 Jan 2022 18:20:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59788) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9bIB-0003ip-Gd for guix-devel@gnu.org; Mon, 17 Jan 2022 18:20:03 -0500 Received: from out0.migadu.com ([94.23.1.103]:13665) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9bI9-0004e5-6q for guix-devel@gnu.org; Mon, 17 Jan 2022 18:20:03 -0500 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kyleam.com; s=key1; t=1642461598; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=x8nNfa4XTf28CChZbZuU+MnxSNoZSF+XUfSiQo+pP0Q=; b=Cla3CgLnvU+cFentt6GWKVEc+DldNMzS/MgbsrOPvLPdzUepYHLjl7LW1I9LBB1Zt+bvEz icfMIm+3HdIB9IvdWZvAqWNBZgnFKHOvYMFmZ/6dLxvFsQnAR/digit/1Pcsh+c+xHkg+a iHg4dsVohPlcQGwssk9i5KvbgxqG98DuggBG+5GC4Gm/7U4w0+vxLJtXAfqTDTkJE/C51/ hb1wpqWL4MQwRIS+gwydaN/hZneUHYPsI+Z62jRA24AZLGe9DL9X8O/jVACxLwfZi/oAtd 1TAzx0vkgMy7hPhMrIclawVaMshFOnzLy+88EsV9tp/xNT2aEWVhHcxFbW5dtA== From: Kyle Meyer To: Leo Famulari Subject: Re: WARNING: Git merges are tricky. Rebasing is better? In-Reply-To: References: <87fspmngn3.fsf@kyleam.com> Date: Mon, 17 Jan 2022 18:19:53 -0500 Message-ID: <87czkqne5i.fsf@kyleam.com> MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=94.23.1.103; envelope-from=kyle@kyleam.com; helo=out0.migadu.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_NONE=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" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1642461628; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=x8nNfa4XTf28CChZbZuU+MnxSNoZSF+XUfSiQo+pP0Q=; b=N71aiY+wx/q9ugS85SlCvRoT+iHrlcrR1aIiOIGzx+t/gk16nFfbPmuGvlmUPVxY5xDrS+ HOmxYH4PmAYAM/UpUFb4pV1XfGWu/qR6h4ldOjV0Iz3kDCTBYeLFH0n/f7+51E5cUhf7/U g/NJDL0MngjgWGN+aNovotPX2LBJh4SvnTyRfuXNHPRclKDYJ3fZEVef0dScfeP7DJK7SK lvH7mjUR0ivYIlv6CW/8e7CQJwjukpxD0r3dpwv969jOPqQb98VrWCUB2BwW1dijJ3+7AW vt/5inMeMIdAnGDCDhvFAS3+f/9Cdukp4yacPyzySWxkUh/Gi4FEvhj0xmrDJw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1642461628; a=rsa-sha256; cv=none; b=rCVtdErGnP8Fi5mEPioaUZKAciYZggx3kmnMWELR+CBoqvOc7eeZlZXnWS9hNsIHf3zDaR EbrGDjt07Dd3t7ctIXGB35OWF0uUrt+1nC1u5Ya4Ew6TUcj+oOXOnwroi0fHITYDOiWrAb m6OKarLrM4kICEUbH7OLysERRXiO0OSLWG0y26Tsru3693C71obJjDcacFd4XkipC4twDC xHdq5sog44/V+pDZnF6stT0LyTFY4OaWXh7IX4uFf8mgDR7mO//v7PYgpBAlQ5Ud3Hqw/8 TKFvlq65/oad8U3TkPnGk0QhGQonPwXB4zz8VDzTlPoGMhgY1ziT11DnTYX6Pg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=kyleam.com header.s=key1 header.b=Cla3CgLn; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -2.92 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=kyleam.com header.s=key1 header.b=Cla3CgLn; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 417CF20547 X-Spam-Score: -2.92 X-Migadu-Scanner: scn1.migadu.com X-TUID: Xp8eaL2eIsRI Leo Famulari writes: > 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. Yes. > Either way, it's bad that the Git history doesn't show these types of > changes. Right, inspecting merge results can be confusing. By default that change is pruned from diffs as "uninteresting" because the merge result matched the content in one of the parents (discussed in the "COMBINED DIFF FORMAT" section of git-diff's manpage and the --diff-merges description of git-show's manpage). $ git show 276f40fd | grep 0r7m34xzz $ git show --diff-merges=combined 276f40fd | grep 0r7m34xzz + "0r7m34xzz3shdfxf2abxb069izak3yv3ijlg29qy4pfmyawkilfs"))