git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* rebase / am separation problem
@ 2019-06-10 15:07 Michal Suchánek
  2019-06-10 18:46 ` Johannes Schindelin
  0 siblings, 1 reply; 2+ messages in thread
From: Michal Suchánek @ 2019-06-10 15:07 UTC (permalink / raw)
  To: git

Hello,

there is an issue with rebase vs am separation.

I am using git 2.20.1 and just observed this behavior:

 - rebase started ( possibly with previous am in progress on 
   different branch - not known)
 - rebase stopped, used am --skip to continue
 - renase was not able to finish

Does anybody else observe this issue?

There is some nesting possible - I am sure that at least one of
cherry-pick and am can be included on top of a commit where git stopped
during rebase -i. However, git should either isolate the three properly
so they can be layered one on top of another of reject the command if
it would corrupt state of currently running command.

Thanks

Michal

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-06-10 18:46 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-10 15:07 rebase / am separation problem Michal Suchánek
2019-06-10 18:46 ` Johannes Schindelin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).