From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id GJgOI8SrxF8VUQAA0tVLHw (envelope-from ) for ; Mon, 30 Nov 2020 08:22:28 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id +O3hHsSrxF/fegAAB5/wlQ (envelope-from ) for ; Mon, 30 Nov 2020 08:22:28 +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 337C194011C for ; Mon, 30 Nov 2020 08:22:28 +0000 (UTC) Received: from localhost ([::1]:48280 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kjeS3-00085n-5q for larch@yhetil.org; Mon, 30 Nov 2020 03:22:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55426) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kjeRd-00083o-Ve for guix-patches@gnu.org; Mon, 30 Nov 2020 03:22:01 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:41822) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kjeRd-0003eU-NX for guix-patches@gnu.org; Mon, 30 Nov 2020 03:22:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kjeRd-0004Us-IG for guix-patches@gnu.org; Mon, 30 Nov 2020 03:22:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44785] [PATCH v2 00/22] Update sequoia to 0.20.0 - version 2 Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 30 Nov 2020 08:22:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44785 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Christopher Baines Cc: 44785@debbugs.gnu.org Received: via spool by 44785-submit@debbugs.gnu.org id=B44785.160672451817274 (code B ref 44785); Mon, 30 Nov 2020 08:22:01 +0000 Received: (at 44785) by debbugs.gnu.org; 30 Nov 2020 08:21:58 +0000 Received: from localhost ([127.0.0.1]:53368 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjeRZ-0004UX-JJ for submit@debbugs.gnu.org; Mon, 30 Nov 2020 03:21:57 -0500 Received: from mail-out.m-online.net ([212.18.0.9]:39027) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjeRX-0004UO-Qo for 44785@debbugs.gnu.org; Mon, 30 Nov 2020 03:21:56 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4CkyrL23Mlz1qsbZ; Mon, 30 Nov 2020 09:21:54 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4CkyrL1KC9z1tSQX; Mon, 30 Nov 2020 09:21:54 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id PrrWTOY7GizU; Mon, 30 Nov 2020 09:21:53 +0100 (CET) Received: from hermia.goebel-consult.de (ppp-188-174-51-228.dynamic.mnet-online.de [188.174.51.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS; Mon, 30 Nov 2020 09:21:53 +0100 (CET) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id E4733601CF; Mon, 30 Nov 2020 09:24:59 +0100 (CET) References: <87r1okh2xn.fsf@cbaines.net> <87wny5u0gz.fsf@cbaines.net> <87h7p9txwv.fsf@cbaines.net> From: Hartmut Goebel Organization: crazy-compilers.com Message-ID: <8595bc86-2bbd-ef47-0505-5066e6be0e92@crazy-compilers.com> Date: Mon, 30 Nov 2020 09:21:50 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.5.0 MIME-Version: 1.0 In-Reply-To: <87h7p9txwv.fsf@cbaines.net> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.7 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -2.28 X-Scanner: ns3122888.ip-94-23-21.eu Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-TUID: RaJu/O8I1orK Hi Christopher, Am 28.11.20 um 14:26 schrieb Christopher Baines: > It won't. However, if two commits change the same place in a file, Git > can't always work out what to do. For example, two packages get added in > roughly the same spot. I still don't get your point. Merge conflicts are business as usual and I will of course handle them when applying the patches. Do you want me to send a new patch-set? -- Regards Hartmut Goebel | Hartmut Goebel | h.goebel@crazy-compilers.com | | www.crazy-compilers.com | compilers which you thought are impossible |