From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-2.8 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by dcvr.yhbt.net (Postfix) with ESMTP id 2B19A1F47D for ; Sat, 25 Feb 2023 16:29:13 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=WC/KV81r; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229584AbjBYQ3F (ORCPT ); Sat, 25 Feb 2023 11:29:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48398 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229504AbjBYQ3E (ORCPT ); Sat, 25 Feb 2023 11:29:04 -0500 Received: from mail-lj1-x22e.google.com (mail-lj1-x22e.google.com [IPv6:2a00:1450:4864:20::22e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 07A405FD0 for ; Sat, 25 Feb 2023 08:29:03 -0800 (PST) Received: by mail-lj1-x22e.google.com with SMTP id j17so2120196ljq.11 for ; Sat, 25 Feb 2023 08:29:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=o1iyWgZczHTmJogixeMIqyK/fObadawIOWJa+36eqsM=; b=WC/KV81rChyuWGImdI1RfJMsGetWKPJipa2N0SyIlv2tFBGun0xzQm6dWk1O4Xf8xf o0bByLb8tyZEvE6P9qXLCmbRHyLm5QPfiRwsVWSaWLntSy+AvTmbNWTjQOvmvAL2uxBI B2vlSNTsq6BO42HAVlQFcTFa6Ex8yrt3B2+DtMo03p5L9eTRYjGJiayrzOLwai+B1aUR w8Htu7FVF1qMVklwpxVuXRQr1ky/Kr40vbNa6kzQbJiB6C2D5l34oAxxyAo+ZHo9GIXS SgkaPvwDrs3js3nGBAq+B1IIqXeGtorYXinrwi41WwBGNoVXKvtFRaNB4bep0R7PCUMf 2esA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=o1iyWgZczHTmJogixeMIqyK/fObadawIOWJa+36eqsM=; b=Uzj9bsVbSS14tkctjrcxuJRzEjv4GuY2G6OHAVxa7YLdsbBAPj9DiImnu/AKBGLXXi hGiZV7edhlhMdBmeCYQR872m/QWYuntmDMVmjdArvZGgfJ2ceSWjojjI6wmAgbcpUFGF XNOPCAiKrj3BxCbSI1MheA1Xn3AqOs6MegZe+8gPgInuuKHD02pjzxX1AG9E9VAccwk1 cIsrWbc2mt+yxPzGsgwxZyENMTn1g2hORWSi/ltvI7BX5tEextWP5xsFVefkAXMUSw1g gXvJWW0sjzOHiObOLvl3xkxbEtEbpY2Jg5Q17/5yqcZgG4V6/ws/vCGl74DjHEISFTr2 GVTA== X-Gm-Message-State: AO0yUKUfXB0U2jIvB7nY6u7kPPyfc617IgFMb7ftumoO7MCeousDtW6+ jStoUkw292kgz+t30pKCqJJLXZ+OgpxFqifYutM= X-Google-Smtp-Source: AK7set+jg5x7TPb1yRJ4G89x/zNtNYZbRODiK/74gAc8/2KbdWwtVPNWke7gdZromdDhqpVgSTYqXIJCFkJAQ64+G/c= X-Received: by 2002:a2e:a268:0:b0:295:b0cd:523 with SMTP id k8-20020a2ea268000000b00295b0cd0523mr188306ljm.6.1677342541107; Sat, 25 Feb 2023 08:29:01 -0800 (PST) MIME-Version: 1.0 References: <87a615vkqk.fsf@osv.gnss.ru> <87bklilnvp.fsf@osv.gnss.ru> <87fsatixnn.fsf@osv.gnss.ru> In-Reply-To: <87fsatixnn.fsf@osv.gnss.ru> From: Elijah Newren Date: Sat, 25 Feb 2023 08:28:49 -0800 Message-ID: Subject: Re: [PATCH] pull: conflict hint pull.rebase suggestion should offer "merges" vs "true" To: Sergey Organov Cc: Tao Klerks , phillip.wood@dunelm.org.uk, Alex Henrie , Tao Klerks via GitGitGadget , git@vger.kernel.org, Johannes Schindelin Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Sat, Feb 25, 2023 at 7:15 AM Sergey Organov wrote: > > Elijah Newren writes: > > > On Fri, Feb 24, 2023 at 2:06 PM Sergey Organov wrote: > >> > >> Elijah Newren writes: > > [...] > > > Please, go read at least [1] to see Johannes comments about how the > > prior proposals don't work beyond simple cases. > > It's exactly handling of simple cases that we need most. We can get > fancy afterwards, if feasible. If we can handle just the simple cases without making common cases significantly worse, that'd be a potential path forward. Any proposal involving the diff between a merge commit and either of its parents (or an equivalent such as a three-way merge involving the merge commit and one of its parents) doesn't achieve that, IMO.