# git-gui: failure to distinguish 3-way common ancestors in hunk markers (#2340) 5 messages from 2019-09-24 to 2019-09-25. Participants: Philip Oakley, Bert Wesarg, Pratyush Yadav. Thread: https://gitlist.dev/t/51910 ## Philip Oakley, 2019-09-24 20:49 Subject: git-gui: failure to distinguish 3-way common ancestors in hunk markers (#2340) Message-ID: URL: https://gitlist.dev/e/b2f412e2-d95f-0f73-5341-73c19ee2c6f7%40iee.email ``` 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 ``` ## Philip Oakley, 2019-09-24 22:05 Subject: Fwd: git-gui: failure to distinguish 3-way common ancestors in hunk markers (#2340) Message-ID: <7baf2b10-56fa-1cb4-0571-cb3c6be8feb3@iee.email> URL: https://gitlist.dev/e/7baf2b10-56fa-1cb4-0571-cb3c6be8feb3%40iee.email In-Reply-To: ``` 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 ``` ## Bert Wesarg, 2019-09-25 06:33 Subject: Re: git-gui: failure to distinguish 3-way common ancestors in hunk markers (#2340) Message-ID: URL: https://gitlist.dev/e/CAKPyHN2sORn_ivC33DDsGe5L5UbNDBc5W6m%3Dh85KUCmBCFCdvw%40mail.gmail.com 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 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 > > > ``` ## Philip Oakley, 2019-09-25 10:09 Subject: Re: git-gui: failure to distinguish 3-way common ancestors in hunk markers (#2340) Message-ID: <64e38298-cd02-c81b-d686-f1120ee079ed@iee.email> URL: https://gitlist.dev/e/64e38298-cd02-c81b-d686-f1120ee079ed%40iee.email In-Reply-To: ``` 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 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 >> >> >> ``` ## Pratyush Yadav, 2019-09-25 13:34 Subject: Re: git-gui: failure to distinguish 3-way common ancestors in hunk markers (#2340) Message-ID: <20190925133447.pmr3pavsosilbavi@yadavpratyush.com> URL: https://gitlist.dev/e/20190925133447.pmr3pavsosilbavi%40yadavpratyush.com In-Reply-To: ``` 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 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 ```