Much like the work around handling merge conflicts, this issue is about ensuring the app correctly detects the user is in a rebase (and that conflicts were found) and asks the user to resolve these before continuing.

The mocks for this can be seen in this comment: #5953 (comment)

TODO:

• when an error occurs that indicates a rebase is occurring, show the dialog
• when git status detects that a rebase is in progress, verify the dialog is shown
• show the list of files and indicate what needs to be addressed (ala merge conflicts)
• let the user abort the rebase
• when there are no more things to resolve, let the user continue the rebase