Indicate in-progress merge, rebase, etc

Open Uncommon opened this issue 14 years ago • 1 comments

Detect situations like a merge or rebase that needs conflicts resolved, indicate the condition in the UI, and provide commands to commit, abort, etc.

Sep 13 '11 22:09 Uncommon

As part of this, the stage view shouldn't allow regular commits when a rebase (or am) is in progress. Instead, it should have skip, continue, and abort commands.

Apr 23 '13 18:04 Uncommon