{"thread":{"id":"49112","subject":"Bug? Interactive rebase with reword after conflict","startedAt":"2018-08-13T11:06:34Z","lastAt":"2018-08-13T14:37:49Z","messageCount":2,"participants":["Dániel Vörös","Elijah Newren"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"355320","messageId":"CA+wscc=TKnWc+Dtq6U=EFZKWEd-0afwFD+mmfR53rA9Ts9toDA@mail.gmail.com","threadId":"49112","inReplyTo":null,"subject":"Bug? Interactive rebase with reword after conflict","fromName":"Dániel Vörös","fromEmail":"daniel.voros@gmail.com","sentAt":"2018-08-13T11:06:20Z","receivedAt":"2018-08-13T11:06:34Z","isPatch":false,"sender":{"key":"daniel.voros@gmail.com","avatar":null},"body":"Hey All,\n\nI'm seeing some weird behavior when doing interactive rebase of a\nsingle commit with reword if there's a conflict. The rebased commit\ngets \"squashed\" into the target commit and is not a child of that.\n\nI've asked this question in the git-users group first a few weeks ago,\nbut got no explanation:\nhttps://groups.google.com/forum/?fromgroups#!topic/git-users/1X15nAts3mg\n\nPlease refer to the link above for detailed repro steps (reproducible\nwith 2.18.0).\n\nKind Regards,\nDaniel\n"},{"id":"355361","messageId":"CABPp-BHkD0Va_Mm+sFDyBH3gwCuR6UD-b3C07YcdS1x3QCzsRQ@mail.gmail.com","threadId":"49112","inReplyTo":"CA+wscc=TKnWc+Dtq6U=EFZKWEd-0afwFD+mmfR53rA9Ts9toDA@mail.gmail.com","subject":"Re: Bug? Interactive rebase with reword after conflict","fromName":"Elijah Newren","fromEmail":"newren@gmail.com","sentAt":"2018-08-13T14:37:34Z","receivedAt":"2018-08-13T14:37:49Z","isPatch":false,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"Hi,\n\nOn Mon, Aug 13, 2018 at 5:26 AM Dániel Vörös <daniel.voros@gmail.com> wrote:\n> Hey All,\n>\n> I'm seeing some weird behavior when doing interactive rebase of a\n> single commit with reword if there's a conflict. The rebased commit\n> gets \"squashed\" into the target commit and is not a child of that.\n\nThis was previously reported by \"ch <cr@onlinehome.de>\"[1] and fixed\nin commit a9279c678588 (\"sequencer: do not squash 'reword' commits\nwhen we hit conflicts\", 2018-06-19).  This commit is part of current\nmaster, but has not yet made it into a release. So, sadly, we don't\nhave a version you can update to to get the fix, unless you want to\nbuild from source and either cherry-pick the change (it applles\ncleanly to 2.18.0) or build a current version of master.  However, it\nshould be part of 2.19 when that comes out.\n\n[1] https://public-inbox.org/git/8e28202a-8646-53e8-8c22-389d61791c70@onlinehome.de/\n\n> I've asked this question in the git-users group first a few weeks ago,\n> but got no explanation:\n> https://groups.google.com/forum/?fromgroups#!topic/git-users/1X15nAts3mg\n>\n> Please refer to the link above for detailed repro steps (reproducible\n> with 2.18.0).\n\nThanks for reporting, and sorry we don't have an immediate solution\nfor you.  It's coming, though.\n\nElijah\n"}]}