From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.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 oL/tIF2m+mGXwQAAgWs5BA (envelope-from ) for ; Wed, 02 Feb 2022 16:42:21 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id QGtpHV2m+mGTBgAAauVa8A (envelope-from ) for ; Wed, 02 Feb 2022 16:42:21 +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 4BB8F3E7BB for ; Wed, 2 Feb 2022 16:42:21 +0100 (CET) Received: from localhost ([::1]:47386 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nFHm0-0001aP-7Z for larch@yhetil.org; Wed, 02 Feb 2022 10:42:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55688) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFGUN-0003Eh-Tn for guix-devel@gnu.org; Wed, 02 Feb 2022 09:20:03 -0500 Received: from [2607:f8b0:4864:20::82b] (port=36592 helo=mail-qt1-x82b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nFGU6-0008Om-WA for guix-devel@gnu.org; Wed, 02 Feb 2022 09:20:03 -0500 Received: by mail-qt1-x82b.google.com with SMTP id z1so16253382qto.3 for ; Wed, 02 Feb 2022 06:19:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=wR6UutNHsFG2JQpeR5uSOKAnF9LtwYTcL9dRgUrUz78=; b=G+EKC6s5HdMnyU5KIrxXuYdeVmZwPfjuNM8cPvB+lj8s2Leyz/RcqgdkZlWg4dNwPD TQYdBY9rmbIEZwFUmimtURIX/8MCeZdFT/ViIJSNiH+eP5kk8A0p0ZIXkcGZclN0zt9u dOsu66RRGNUp7eWueXX8DGobHx6/DlBinQ0oB1dvnBGW7AxqcwbfyK4LsPiBJgrf6cgc Y/1X9G2IfDnVyzVzG1SXPko8GYFiY8m5WDi7kJgD6HxbDX1OuiXl7Tjai9leMvT6jusO jefwxTwUTtXXPuML2y9xZnwbQIATRORRJGS2Mu898hEt6HA+tMLy/5oVsZ601Gn+5+zq QKyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=wR6UutNHsFG2JQpeR5uSOKAnF9LtwYTcL9dRgUrUz78=; b=IHCmll6aScZqdVLanlxnbV9NHt8x1Pk5r1j5adqd8NaXBi315gLIUq4I/Z4q5rGwBT JQEKX+4NM5DX+Ss5qSp2w2E4NZkp8v9+PIO1Lc4Y3Vd3np5cDaxq+KlNLGZz5DwXNAaR JVJ6Q1g72TnAxNaKgYer4BWdqOOZbmjwNrWviKtIO0/vT4DVFE/B+y2pj1xnxj4hq/xZ wbPb03OzrPeBdcHyxOfX5jBbuwESSxJ22wkQyLGhDm4/kcRTASFXX2+oSBXI4KQDHygl BTIsDg3e1zu8xL/VqnvCxkqSEdiJkJAwygXWcoyxTIipzvHTmeJWSrfmKt39wb4GzEiE yBBA== X-Gm-Message-State: AOAM532TrdtVX16WGG9tziyykhjArd8VRv9IAl3W4CEj2EkgbdSKMPU1 HxlsN7zJ56SiAaLPfabDipVIawdDTNk= X-Google-Smtp-Source: ABdhPJxhVZhc8dXmll/hCsfhyYYyRCE2k2PUbTr55FdnwJpghvSpC/4BGyHjDVHt4UcPydtMjkjCVg== X-Received: by 2002:ac8:7c52:: with SMTP id o18mr12755337qtv.256.1643811585821; Wed, 02 Feb 2022 06:19:45 -0800 (PST) Received: from hurd (dsl-149-193.b2b2c.ca. [66.158.149.193]) by smtp.gmail.com with ESMTPSA id j11sm1022281qtj.74.2022.02.02.06.19.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Feb 2022 06:19:45 -0800 (PST) From: Maxim Cournoyer To: Kyle Meyer Subject: Re: WARNING: Git merges are tricky. Rebasing is better? References: <87fspmngn3.fsf@kyleam.com> <87czkqne5i.fsf@kyleam.com> Date: Wed, 02 Feb 2022 09:19:44 -0500 In-Reply-To: <87czkqne5i.fsf@kyleam.com> (Kyle Meyer's message of "Mon, 17 Jan 2022 18:19:53 -0500") Message-ID: <87bkzpz6yn.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::82b (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::82b; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qt1-x82b.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 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, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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=1643816541; 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=wR6UutNHsFG2JQpeR5uSOKAnF9LtwYTcL9dRgUrUz78=; b=JXr/QemqdW86Z6InHHjy5fs3EvE49ielx+S9sVk7O1HSOA1KoscBzjXA5Kmt71gO+cKNaj fMbx0Qbe1EU0glYJuu/zT2JqZIljv0JWNJTJco9gbBEBDreeykDmrX2eElhOo2YphzotjO Vje3iJGhoaBRvu0ePg1IR6cZW5mrZeeVAqv5SboJMusvm2MS6w2jD5NzypvE/1MopZ+mPk b5ta4+JQfDIiSPQDJx5atM/xS8YUGlYlXW57i7zk2gVS/g9aMmwvGM4wfOhJyPLxAajGJq CYtfPUsthmg7rqJVDY09f7RYV4CxmDjcCkf9Y/PBtAAWfdB5pSP/4Erj+TMY+g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1643816541; a=rsa-sha256; cv=none; b=XHn8KcawA0zk4XIQckiYpxlGRiidkHuP3YUvMcqkjTz0UqhG2fFm2ZIlWxbxibxJWTdFzh 6Ill5uxStV+xh4Td+c0YgIwYWQkQn6SNG249M/XXzIRgnnx+8e64We/jW+IiKtKV1Wv+Lo 0d1/u4S8U/NJfRo6/wCmng7EsDW/6tJ9cBvgwzG09pZFYYBQKzi0ujtrlZQQpJw91Z+mHo 2sIXe+NEJNw/16ANbkc271uRzzsEEhchNOCFU1ZehWKDo4TvHVuWk8Q95EU4aCC5uwDq3F zokxg022WIqK5OgCOrVMhr81sDLACv0yGpGQUlEap/nHa+yqo+p/9c7p1Lb65Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=G+EKC6s5; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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: -1.03 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=G+EKC6s5; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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: 4BB8F3E7BB X-Spam-Score: -1.03 X-Migadu-Scanner: scn1.migadu.com X-TUID: lVhFYeq8tOSx Hello Kyle and Leo, Kyle Meyer writes: > 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")) Thanks for this interesting discussion, and apologies for mis-resolving the conflict :-) Maxim