{"thread":{"id":"51910","subject":"git-gui: failure to distinguish 3-way common ancestors in hunk markers (#2340)","startedAt":"2019-09-24T22:02:47Z","lastAt":"2019-09-25T13:34:53Z","messageCount":5,"participants":["Philip Oakley","Bert Wesarg","Pratyush Yadav"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"382878","messageId":"b2f412e2-d95f-0f73-5341-73c19ee2c6f7@iee.email","threadId":"51910","inReplyTo":null,"subject":"git-gui: failure to distinguish 3-way common ancestors in hunk markers (#2340)","fromName":"Philip Oakley","fromEmail":"philipoakley@iee.email","sentAt":"2019-09-24T20:49:44Z","receivedAt":"2019-09-24T22:02:47Z","isPatch":false,"sender":{"key":"philipoakley@iee.email","avatar":"https://avatars.githubusercontent.com/u/914343?v=4"},"body":"Hi list,\ncc Pratyush,\n\nWhile rebasing an old series, I had a 3-way merge fall back that didn't \nshow the `||||||| merged common ancestors` very well in git-gui.\n\nThat is, the conflict markers, and common ancestor lines, are treated as \nbeing part of the current HEAD hunk, rather than being separated.\n\nI opened a Git for Windows issue \nhttps://github.com/git-for-windows/git/issues/2340 and attach the \nscreenshot of the git-gui markers.\n\nI've not had any chance to look at the underlying code, but thought it \nworth reporting. I guess the issue has been there a while.\n\nPhilip\n\n\n"},{"id":"382879","messageId":"7baf2b10-56fa-1cb4-0571-cb3c6be8feb3@iee.email","threadId":"51910","inReplyTo":"b2f412e2-d95f-0f73-5341-73c19ee2c6f7@iee.email","subject":"Fwd: git-gui: failure to distinguish 3-way common ancestors in hunk markers (#2340)","fromName":"Philip Oakley","fromEmail":"philipoakley@iee.email","sentAt":"2019-09-24T22:05:26Z","receivedAt":"2019-09-24T22:05:28Z","isPatch":false,"sender":{"key":"philipoakley@iee.email","avatar":"https://avatars.githubusercontent.com/u/914343?v=4"},"body":"Hi list,\ncc Pratyush,\n\n[resend without attached png file]\n\nWhile rebasing an old series, I had a 3-way merge fall back that didn't \nshow the `||||||| merged common ancestors` very well in git-gui.\n\nThat is, the conflict markers, and common ancestor lines, are treated as \nbeing part of the current HEAD hunk, rather than being separated.\n\nI opened a Git for Windows issue \nhttps://github.com/git-for-windows/git/issues/2340 which has the \nscreenshot of the git-gui markers.\n\nI've not had any chance to look at the underlying code, but thought it \nworth reporting. I guess the issue has been there a while.\n\nPhilip\n\n\n\n"},{"id":"382895","messageId":"CAKPyHN2sORn_ivC33DDsGe5L5UbNDBc5W6m=h85KUCmBCFCdvw@mail.gmail.com","threadId":"51910","inReplyTo":"7baf2b10-56fa-1cb4-0571-cb3c6be8feb3@iee.email","subject":"Re: git-gui: failure to distinguish 3-way common ancestors in hunk markers (#2340)","fromName":"Bert Wesarg","fromEmail":"bert.wesarg@googlemail.com","sentAt":"2019-09-25T06:33:25Z","receivedAt":"2019-09-25T06:33:42Z","isPatch":false,"sender":{"key":"bert.wesarg@googlemail.com","avatar":"https://avatars.githubusercontent.com/u/111934?v=4"},"body":"Pratyush,\n\nonce again, I had done this years ago. I may post an updated patch in\nthe evening:\n\nhttps://github.com/bertwesarg/git-gui/commit/90ee4a8c260132a6b730040095929fd267cedd7b\n\nBert\n\nOn Wed, Sep 25, 2019 at 12:05 AM Philip Oakley wrote:\n>\n> Hi list,\n> cc Pratyush,\n>\n> [resend without attached png file]\n>\n> While rebasing an old series, I had a 3-way merge fall back that didn't\n> show the `||||||| merged common ancestors` very well in git-gui.\n>\n> That is, the conflict markers, and common ancestor lines, are treated as\n> being part of the current HEAD hunk, rather than being separated.\n>\n> I opened a Git for Windows issue\n> https://github.com/git-for-windows/git/issues/2340 which has the\n> screenshot of the git-gui markers.\n>\n> I've not had any chance to look at the underlying code, but thought it\n> worth reporting. I guess the issue has been there a while.\n>\n> Philip\n>\n>\n>\n"},{"id":"382905","messageId":"64e38298-cd02-c81b-d686-f1120ee079ed@iee.email","threadId":"51910","inReplyTo":"CAKPyHN2sORn_ivC33DDsGe5L5UbNDBc5W6m=h85KUCmBCFCdvw@mail.gmail.com","subject":"Re: git-gui: failure to distinguish 3-way common ancestors in hunk markers (#2340)","fromName":"Philip Oakley","fromEmail":"philipoakley@iee.email","sentAt":"2019-09-25T10:09:32Z","receivedAt":"2019-09-25T10:09:35Z","isPatch":false,"sender":{"key":"philipoakley@iee.email","avatar":"https://avatars.githubusercontent.com/u/914343?v=4"},"body":"On 25/09/2019 07:33, Bert Wesarg wrote:\n> Pratyush,\n>\n> once again, I had done this years ago. I may post an updated patch in\n> the evening:\n>\n> https://github.com/bertwesarg/git-gui/commit/90ee4a8c260132a6b730040095929fd267cedd7b\n>\n> Bert\nThanks, I'll see if I can look at it (I'd also need to re-prepare my \nrerere cache [how to do /that/ ?] and the rebase)\n\n>\n> On Wed, Sep 25, 2019 at 12:05 AM Philip Oakley wrote:\n>> Hi list,\n>> cc Pratyush,\n>>\n>> [resend without attached png file]\n>>\n>> While rebasing an old series, I had a 3-way merge fall back that didn't\n>> show the `||||||| merged common ancestors` very well in git-gui.\n>>\n>> That is, the conflict markers, and common ancestor lines, are treated as\n>> being part of the current HEAD hunk, rather than being separated.\n>>\n>> I opened a Git for Windows issue\n>> https://github.com/git-for-windows/git/issues/2340 which has the\n>> screenshot of the git-gui markers.\n>>\n>> I've not had any chance to look at the underlying code, but thought it\n>> worth reporting. I guess the issue has been there a while.\n>>\n>> Philip\n>>\n>>\n>>\n\n"},{"id":"382926","messageId":"20190925133447.pmr3pavsosilbavi@yadavpratyush.com","threadId":"51910","inReplyTo":"CAKPyHN2sORn_ivC33DDsGe5L5UbNDBc5W6m=h85KUCmBCFCdvw@mail.gmail.com","subject":"Re: git-gui: failure to distinguish 3-way common ancestors in hunk markers (#2340)","fromName":"Pratyush Yadav","fromEmail":"me@yadavpratyush.com","sentAt":"2019-09-25T13:34:47Z","receivedAt":"2019-09-25T13:34:53Z","isPatch":false,"sender":{"key":"me@yadavpratyush.com","avatar":"https://avatars.githubusercontent.com/u/8817931?v=4"},"body":"On 25/09/19 08:33AM, Bert Wesarg wrote:\n> Pratyush,\n> \n> once again, I had done this years ago. I may post an updated patch in\n> the evening:\n> \n> https://github.com/bertwesarg/git-gui/commit/90ee4a8c260132a6b730040095929fd267cedd7b\n\nNice! I was about to dive into this bug, but it is great that you have \nalready fixed it. Send it on the list when you get the time and we can \ndiscuss it here :)\n \n> On Wed, Sep 25, 2019 at 12:05 AM Philip Oakley wrote:\n> >\n> > Hi list,\n> > cc Pratyush,\n> >\n> > [resend without attached png file]\n> >\n> > While rebasing an old series, I had a 3-way merge fall back that didn't\n> > show the `||||||| merged common ancestors` very well in git-gui.\n> >\n> > That is, the conflict markers, and common ancestor lines, are treated as\n> > being part of the current HEAD hunk, rather than being separated.\n> >\n> > I opened a Git for Windows issue\n> > https://github.com/git-for-windows/git/issues/2340 which has the\n> > screenshot of the git-gui markers.\n> >\n> > I've not had any chance to look at the underlying code, but thought it\n> > worth reporting. I guess the issue has been there a while.\n\n-- \nRegards,\nPratyush Yadav\n"}]}