Re: [PATCH 2/2] git-gui: support for diff3 conflict style

From: Philip Oakley <philipoakley@iee.email>
Date: Oct 3, 2019, 21:40 UTC
Message-ID: <e5ae969c-6d82-ed13-b309-f8010288fbd9@iee.email>
In-Reply-To: <20191003205407.uaguw7qyabfy3aym@yadavpratyush.com>

On 03/10/2019 21:54, Pratyush Yadav wrote:

Show 14 quoted lines

>> 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