Please describe the problem you think should be solved

@tierninho has raised some excellent feedback about how menu items are enabled/disabled as part of addressing rebase conflicts:

If a merge conflict is in progress and is currently in manual resolution mode (banner present), then the Rebase current branch menu option should not be enabled as it results in an error message:

#6961 (comment)

the Push menu item is still active in the Repo menu, which triggers a console error:
Uncaught (in promise) Error: The current repository is in a detached HEAD state

#6984

if rebase in progress, then New Branch menu option should be disabled as well to avoid confusion and error:

#6994

[Optional] Do you have any potential solutions in mind?

Not currently. I'd have probably thought more about it if we'd heard external feedback about this issue, but I think this just requires sitting down and reviewing the menu options and proposing better rules and the rationale behind them.