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-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.8 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_NONE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id B58A11F4BD for ; Thu, 3 Oct 2019 21:40:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389358AbfJCVkL (ORCPT ); Thu, 3 Oct 2019 17:40:11 -0400 Received: from smtp.hosts.co.uk ([85.233.160.19]:41970 "EHLO smtp.hosts.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387926AbfJCVkL (ORCPT ); Thu, 3 Oct 2019 17:40:11 -0400 Received: from [92.7.169.237] (helo=[192.168.1.22]) by smtp.hosts.co.uk with esmtpa (Exim) (envelope-from ) id 1iG8pV-0000ss-3Z; Thu, 03 Oct 2019 22:40:09 +0100 Subject: Re: [PATCH 2/2] git-gui: support for diff3 conflict style To: Pratyush Yadav Cc: Bert Wesarg , Git Mailing List References: <97013a71289857767100d6a4adcb39ca99b2b21b.1569443729.git.bert.wesarg@googlemail.com> <20190929150406.s57pmb3dggfbcqhr@yadavpratyush.com> <20191003205407.uaguw7qyabfy3aym@yadavpratyush.com> From: Philip Oakley Message-ID: Date: Thu, 3 Oct 2019 22:40:09 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <20191003205407.uaguw7qyabfy3aym@yadavpratyush.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-GB Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On 03/10/2019 21:54, Pratyush Yadav wrote: >> My only remaining bikeshed question it prompted was to check which parts >> would be committed as part of committing the whole "hunk". But haven't had >> time to look at all! > I'm not sure what you mean by "committing the whole hunk". In a merge > conflict state, you don't get the usual "Stage hunk" and "Stage lines" > options, but instead get 3 options: > > Use Remote Version > Use Local Version > Revert To Base > > You can use these to choose how you want to resolve the conflict. > > These 3 options seem to work fine on my quick testing. That looks like just the answer I was hoping for! Thanks. -- Philip