All of lore.kernel.org
 help / color / mirror / Atom feed
From: Bert Wesarg <bert.wesarg@googlemail.com>
To: Pratyush Yadav <me@yadavpratyush.com>
Cc: Git List <git@vger.kernel.org>, Philip Oakley <philipoakley@iee.email>
Subject: Re: git-gui: failure to distinguish 3-way common ancestors in hunk markers (#2340)
Date: Wed, 25 Sep 2019 08:33:25 +0200	[thread overview]
Message-ID: <CAKPyHN2sORn_ivC33DDsGe5L5UbNDBc5W6m=h85KUCmBCFCdvw@mail.gmail.com> (raw)
In-Reply-To: <7baf2b10-56fa-1cb4-0571-cb3c6be8feb3@iee.email>

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

  reply	other threads:[~2019-09-25  6:33 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 [this message]
2019-09-25 10:09     ` Philip Oakley
2019-09-25 13:34     ` Pratyush Yadav

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAKPyHN2sORn_ivC33DDsGe5L5UbNDBc5W6m=h85KUCmBCFCdvw@mail.gmail.com' \
    --to=bert.wesarg@googlemail.com \
    --cc=git@vger.kernel.org \
    --cc=me@yadavpratyush.com \
    --cc=philipoakley@iee.email \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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.