Re: git-gui: failure to distinguish 3-way common ancestors in hunk markers (#2340)
On 25/09/19 08:33AM, Bert Wesarg wrote:
Show 6 quoted lines
> 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 :)
Show 19 quoted lines
> 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
Pratyush Yadav <me@yadavpratyush.com>