From: Philip Oakley <philipoakley@iee.email>
Date: Fri, 04 Oct 2019 16:09:39 GMT
Subject: Re: [PATCH 2/2] git-gui: support for diff3 conflict style
Message-ID: <c1d27317-3ca7-14c6-7fd8-047282894c68@iee.email>
In-Reply-To: <CAKPyHN0_AUqLpPVDNJUZqNV8zRQzaDOMXJV4AbnK969AdtGpNg@mail.gmail.com>

On 04/10/2019 16:22, Bert Wesarg wrote:
> On Thu, Oct 3, 2019 at 11:40 PM Philip Oakley <philipoakley@iee.email> wrote:
>> 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!
> note, that these three options apply to the whole file, not for
> individual conflicts.
>
>
Hmm, maybe not as great as hoped, but it's a start.
Philip