--- a/hgext/rebase.py	Wed Dec 02 15:15:16 2020 -0800
+++ b/hgext/rebase.py	Wed Dec 02 15:39:01 2020 -0800
@@ -638,7 +638,12 @@
                                 b"commit again in the working copy\n"
                             )
                         )
-                        cmdutil.bailifchanged(repo)
+                        try:
+                            cmdutil.bailifchanged(repo)
+                        except error.Abort:
+                            clearstatus(repo)
+                            clearcollapsemsg(repo)
+                            raise
                         self.inmemory = False
                         self._assignworkingcopy()
                         mergemod.update(repo[p1], wc=self.wctx)