* git-gui: failure to distinguish 3-way common ancestors in hunk markers (#2340)
@ 2019-09-24 20:49 Philip Oakley
2019-09-24 22:05 ` Fwd: " Philip Oakley
0 siblings, 1 reply; 5+ messages in thread
From: Philip Oakley @ 2019-09-24 20:49 UTC (permalink / raw)
To: Git List, Pratyush Yadav
[-- Attachment #1: Type: text/plain, Size: 581 bytes --]
Hi list,
cc Pratyush,
While rebasing an old series, I had a 3-way merge fall back that didn't
show the `||||||| merged common ancestors` very well in git-gui.
That is, the conflict markers, and common ancestor lines, are treated as
being part of the current HEAD hunk, rather than being separated.
I opened a Git for Windows issue
https://github.com/git-for-windows/git/issues/2340 and attach the
screenshot of the git-gui markers.
I've not had any chance to look at the underlying code, but thought it
worth reporting. I guess the issue has been there a while.
Philip
[-- Attachment #2: git gui 3-way merge markers.png --]
[-- Type: image/png, Size: 51626 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Fwd: git-gui: failure to distinguish 3-way common ancestors in hunk markers (#2340)
2019-09-24 20:49 git-gui: failure to distinguish 3-way common ancestors in hunk markers (#2340) Philip Oakley
@ 2019-09-24 22:05 ` Philip Oakley
2019-09-25 6:33 ` Bert Wesarg
0 siblings, 1 reply; 5+ messages in thread
From: Philip Oakley @ 2019-09-24 22:05 UTC (permalink / raw)
To: Git List, Pratyush Yadav
Hi list,
cc Pratyush,
[resend without attached png file]
While rebasing an old series, I had a 3-way merge fall back that didn't
show the `||||||| merged common ancestors` very well in git-gui.
That is, the conflict markers, and common ancestor lines, are treated as
being part of the current HEAD hunk, rather than being separated.
I opened a Git for Windows issue
https://github.com/git-for-windows/git/issues/2340 which has the
screenshot of the git-gui markers.
I've not had any chance to look at the underlying code, but thought it
worth reporting. I guess the issue has been there a while.
Philip
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: git-gui: failure to distinguish 3-way common ancestors in hunk markers (#2340)
2019-09-24 22:05 ` Fwd: " Philip Oakley
@ 2019-09-25 6:33 ` Bert Wesarg
2019-09-25 10:09 ` Philip Oakley
2019-09-25 13:34 ` Pratyush Yadav
0 siblings, 2 replies; 5+ messages in thread
From: Bert Wesarg @ 2019-09-25 6:33 UTC (permalink / raw)
To: Pratyush Yadav; +Cc: Git List, Philip Oakley
Pratyush,
once again, I had done this years ago. I may post an updated patch in
the evening:
https://github.com/bertwesarg/git-gui/commit/90ee4a8c260132a6b730040095929fd267cedd7b
Bert
On Wed, Sep 25, 2019 at 12:05 AM Philip Oakley <philipoakley@iee.email> wrote:
>
> Hi list,
> cc Pratyush,
>
> [resend without attached png file]
>
> While rebasing an old series, I had a 3-way merge fall back that didn't
> show the `||||||| merged common ancestors` very well in git-gui.
>
> That is, the conflict markers, and common ancestor lines, are treated as
> being part of the current HEAD hunk, rather than being separated.
>
> I opened a Git for Windows issue
> https://github.com/git-for-windows/git/issues/2340 which has the
> screenshot of the git-gui markers.
>
> I've not had any chance to look at the underlying code, but thought it
> worth reporting. I guess the issue has been there a while.
>
> Philip
>
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: git-gui: failure to distinguish 3-way common ancestors in hunk markers (#2340)
2019-09-25 6:33 ` Bert Wesarg
@ 2019-09-25 10:09 ` Philip Oakley
2019-09-25 13:34 ` Pratyush Yadav
1 sibling, 0 replies; 5+ messages in thread
From: Philip Oakley @ 2019-09-25 10:09 UTC (permalink / raw)
To: Bert Wesarg, Git List
On 25/09/2019 07:33, Bert Wesarg wrote:
> Pratyush,
>
> once again, I had done this years ago. I may post an updated patch in
> the evening:
>
> https://github.com/bertwesarg/git-gui/commit/90ee4a8c260132a6b730040095929fd267cedd7b
>
> Bert
Thanks, I'll see if I can look at it (I'd also need to re-prepare my
rerere cache [how to do /that/ ?] and the rebase)
>
> On Wed, Sep 25, 2019 at 12:05 AM Philip Oakley <philipoakley@iee.email> wrote:
>> Hi list,
>> cc Pratyush,
>>
>> [resend without attached png file]
>>
>> While rebasing an old series, I had a 3-way merge fall back that didn't
>> show the `||||||| merged common ancestors` very well in git-gui.
>>
>> That is, the conflict markers, and common ancestor lines, are treated as
>> being part of the current HEAD hunk, rather than being separated.
>>
>> I opened a Git for Windows issue
>> https://github.com/git-for-windows/git/issues/2340 which has the
>> screenshot of the git-gui markers.
>>
>> I've not had any chance to look at the underlying code, but thought it
>> worth reporting. I guess the issue has been there a while.
>>
>> Philip
>>
>>
>>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: git-gui: failure to distinguish 3-way common ancestors in hunk markers (#2340)
2019-09-25 6:33 ` Bert Wesarg
2019-09-25 10:09 ` Philip Oakley
@ 2019-09-25 13:34 ` Pratyush Yadav
1 sibling, 0 replies; 5+ messages in thread
From: Pratyush Yadav @ 2019-09-25 13:34 UTC (permalink / raw)
To: Bert Wesarg; +Cc: Git List, Philip Oakley
On 25/09/19 08:33AM, Bert Wesarg wrote:
> Pratyush,
>
> once again, I had done this years ago. I may post an updated patch in
> the evening:
>
> https://github.com/bertwesarg/git-gui/commit/90ee4a8c260132a6b730040095929fd267cedd7b
Nice! I was about to dive into this bug, but it is great that you have
already fixed it. Send it on the list when you get the time and we can
discuss it here :)
> On Wed, Sep 25, 2019 at 12:05 AM Philip Oakley <philipoakley@iee.email> wrote:
> >
> > Hi list,
> > cc Pratyush,
> >
> > [resend without attached png file]
> >
> > While rebasing an old series, I had a 3-way merge fall back that didn't
> > show the `||||||| merged common ancestors` very well in git-gui.
> >
> > That is, the conflict markers, and common ancestor lines, are treated as
> > being part of the current HEAD hunk, rather than being separated.
> >
> > I opened a Git for Windows issue
> > https://github.com/git-for-windows/git/issues/2340 which has the
> > screenshot of the git-gui markers.
> >
> > I've not had any chance to look at the underlying code, but thought it
> > worth reporting. I guess the issue has been there a while.
--
Regards,
Pratyush Yadav
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-09-25 13:34 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-24 20:49 git-gui: failure to distinguish 3-way common ancestors in hunk markers (#2340) Philip Oakley
2019-09-24 22:05 ` Fwd: " Philip Oakley
2019-09-25 6:33 ` Bert Wesarg
2019-09-25 10:09 ` Philip Oakley
2019-09-25 13:34 ` Pratyush Yadav
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.