From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-3.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_PASS, SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id D2E101F5AE for ; Fri, 24 Jul 2020 05:15:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726780AbgGXFPf (ORCPT ); Fri, 24 Jul 2020 01:15:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726001AbgGXFPe (ORCPT ); Fri, 24 Jul 2020 01:15:34 -0400 Received: from mail-ua1-x92b.google.com (mail-ua1-x92b.google.com [IPv6:2607:f8b0:4864:20::92b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A9A3AC0619D3 for ; Thu, 23 Jul 2020 22:15:34 -0700 (PDT) Received: by mail-ua1-x92b.google.com with SMTP id h18so2569795uao.6 for ; Thu, 23 Jul 2020 22:15:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=6idW5og3jRRdgzwpWes7KDNblsUj/3hE7I2nFb4GvpE=; b=Cr7rxEojkwQkIn4Ot9KRBSV8ns9YjxcmWy1qstJlj7WxfBh9xNWvi1LJ5s8w0gVyfv Jk95bhQb9JkGCkcQPoJj+g3bV1WkDWDb9+WMhoEMOTD4xV4dh61wrE46t6x4ZuO/U65k Z4eGvnWBczWZT9tTF2yNrELUX/58eQ7lC98e/oSu6T28jK9ejFNHZhmQaJfR0SOrFlQG H5wnbVUDo20Xw6pudpKGsbf39KVXiXnqk83/RhdtJ4eQmVV1kBVXVh889aVe6zqDYxW8 ywovgKBIQeZ9cm6PYxkZA116TiEjx8n6f2QgrtwIWSy2qXVJ94NZn7xk4OyyJgBhEwsE kRwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=6idW5og3jRRdgzwpWes7KDNblsUj/3hE7I2nFb4GvpE=; b=doOzyirSNEXyeTMG65qP33WMbAsKmUJxtHKS2gzuUz26Ic+1t31fWbtlbdSj32JwFX RyKbqpbimMu+UGMV/OpY6NSHKP67RTxUulAZ41QoaAyrKlPl7+FqCeQJquobNNJu3CqL HclQ0M+tAi7/ar+796HboRNsOxHDJidXvssXqLYIDuSZ2BDCP/nUkWnM3P25GAPL1rXd xpiTLJLsgttWYgcuE9RsuN4iHrrh0YylUcleYKrJ00rmqfpeBwcLMAzDfvIHw1GQd1Ym +IQOp4SV274EJuiwDYrgMi2kr5AILyt5JNe/zxaTDrsKCzb9B6DxWcqLcbKayCOaaVWB 6KbA== X-Gm-Message-State: AOAM531QpXOWJ3hmB3e9Qk7agf4tK5vnX5bU5Im7pQgHaUBf5LXH6sKC T5zjUnRhfNKGQPkJj2zKvU0LufZ373uzR6U1K6s= X-Google-Smtp-Source: ABdhPJxFO1siYhPffZBSaTCO44iE1eervFE6pChcBFWyELWRpr7Umw/Dr1+55MTdHSrEi5yqcD5I2ASP1TS+56Wl0XU= X-Received: by 2002:ab0:76d2:: with SMTP id w18mr6479477uaq.27.1595567733624; Thu, 23 Jul 2020 22:15:33 -0700 (PDT) MIME-Version: 1.0 References: <4df975f0-e4b1-afa1-cac1-f38e6d31a0d8@kdbg.org> <874kpzmhis.fsf@osv.gnss.ru> <87tuxzl00h.fsf@osv.gnss.ru> <20200723182648.GC3975154@coredump.intra.peff.net> <87blk6yrlc.fsf@osv.gnss.ru> In-Reply-To: From: Jacob Keller Date: Thu, 23 Jul 2020 22:15:23 -0700 Message-ID: Subject: Re: Improving merge of tricky conflicts To: Junio C Hamano Cc: Sergey Organov , Jeff King , Johannes Sixt , "B. Stebler" , Git mailing list Content-Type: text/plain; charset="UTF-8" Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Thu, Jul 23, 2020 at 2:43 PM Junio C Hamano wrote: > If your merge used the merge (as opposed to diff3) style, and seeing > that the resulting conflict is not easy to review and you wish you > used diff3 style instead, it is way too late for any option to "git > merge" to help you. > > But having an option to "git checkout" lets you move forward from > that state, so it also makes 100% more sense than an option to "git > merge". > Perhaps the issue is just that it's not discoverable easily because it's a different command.