Can no longer make new commits during interactive rebase

Describe the bug

Earlier I could start an interactive rebase, and while on a certain commit I could make changes and commit these in Github Desktop. Now (probably after some recent update) this does no longer work, and it doesn’t let me commit anything, only says “Resolve conflicts to continue rebasing <branch>”. Clicking “View Conflicts” shows “All conflicts resolved”

Version & OS

Version 2.5.4, on macOS 10.15.6

Steps to reproduce the behavior

1. Rebase branch git rebase -i master
2. Edit a commit.
3. Make changes
4. Try to commit changes in Github Desktop

Expected behavior

Let me commit changes.

Actual behavior

Cannot commit anything.

[halseth]

@niik I understand that this is perhaps not the intended way of using the app, but that being said this used to be supported earlier (I did this regularly a few months ago).

If the support is not coming back, I plan to revert back to the latest version where this was supported. I can report at which version it stopped working if that is helpful.

[AlanSl]

Of course it’d be nice to be able to do ☝️ without the hackiness of this workaround or requiring temporary branch.

I wonder if we could, and what the implications would be of, ignoring ongoing interactive rebases in the app and only act on non-interactive rebases.

How about simply not disabling the UI if it’s an interactive rebase; only disabling and greying out the UI for staging and committing during a Desktop-initiated rebase?

Or re-enabling the staging/comitting UI if the user closes the dialog using its (x) button?

For interactive rebases from the CLI using things like re-ordering and fixup, GitHub Desktop does a good job of presenting merge conflicts in a clear way, and the “continue” and “abort” buttons seem to work fine. The only problem I’ve found is that during an edit, if I close the dialog using (x), all the UI controls are disabled. If they weren’t I could make my commits in the UI, bring back the dialog from the status bar message, press “Continue rebase” and (I think) it’d work just fine.