{"thread":{"id":"51280","subject":"rebase / am separation problem","startedAt":"2019-06-10T15:07:21Z","lastAt":"2019-06-10T18:46:45Z","messageCount":2,"participants":["Michal Suchánek","Johannes Schindelin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"376932","messageId":"20190610170718.2f9fe177@naga.suse.cz","threadId":"51280","inReplyTo":null,"subject":"rebase / am separation problem","fromName":"Michal Suchánek","fromEmail":"msuchanek@suse.de","sentAt":"2019-06-10T15:07:18Z","receivedAt":"2019-06-10T15:07:21Z","isPatch":false,"sender":{"key":"msuchanek@suse.de","avatar":"https://avatars.githubusercontent.com/u/787652?v=4"},"body":"Hello,\n\nthere is an issue with rebase vs am separation.\n\nI am using git 2.20.1 and just observed this behavior:\n\n - rebase started ( possibly with previous am in progress on \n   different branch - not known)\n - rebase stopped, used am --skip to continue\n - renase was not able to finish\n\nDoes anybody else observe this issue?\n\nThere is some nesting possible - I am sure that at least one of\ncherry-pick and am can be included on top of a commit where git stopped\nduring rebase -i. However, git should either isolate the three properly\nso they can be layered one on top of another of reject the command if\nit would corrupt state of currently running command.\n\nThanks\n\nMichal\n"},{"id":"376962","messageId":"nycvar.QRO.7.76.6.1906102046110.789@QRFXGBC-DHN364S.ybpnyqbznva","threadId":"51280","inReplyTo":"20190610170718.2f9fe177@naga.suse.cz","subject":"Re: rebase / am separation problem","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2019-06-10T18:46:55Z","receivedAt":"2019-06-10T18:46:45Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Michal\n\nOn Mon, 10 Jun 2019, Michal Suchánek wrote:\n\n> I am using git 2.20.1 and just observed this behavior:\n\nHave you tested this with v2.21.0 (which is over three months old by now),\nor even v2.22.0?\n\nCiao,\nJohannes\n"}]}