From: Philip Oakley <philipoakley@iee.email>
To: Git List <git@vger.kernel.org>, Pratyush Yadav <me@yadavpratyush.com>
Subject: git-gui: failure to distinguish 3-way common ancestors in hunk markers (#2340)
Date: Tue, 24 Sep 2019 21:49:44 +0100 [thread overview]
Message-ID: <b2f412e2-d95f-0f73-5341-73c19ee2c6f7@iee.email> (raw)
[-- 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 --]
next reply other threads:[~2019-09-24 22:02 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-24 20:49 Philip Oakley [this message]
2019-09-24 22:05 ` Fwd: git-gui: failure to distinguish 3-way common ancestors in hunk markers (#2340) Philip Oakley
2019-09-25 6:33 ` Bert Wesarg
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=b2f412e2-d95f-0f73-5341-73c19ee2c6f7@iee.email \
--to=philipoakley@iee.email \
--cc=git@vger.kernel.org \
--cc=me@yadavpratyush.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox