- Notifications
You must be signed in to change notification settings - Fork 289
Closed
Labels
enhancementNew feature or requestNew feature or request
Description
Steps to reproduce:
- Perform an interactive rebase
- Choose Edit for a commit
- Click on
Start
What that does:
- Good: It does perform an interactive rebase and stops at that commit so that the user can edit it
- Good: There is a banner at the top saying that there is an ongoing rebase
- Bad: The buttons in the banner are
Resolve
andAbort
as if there was a conflict- There is no conflict to resolve, so the buttons should be
Continue
andAbort
- I may be remembering this incorrectly but I think that this used to be handled properly until some weeks ago
- There is no conflict to resolve, so the buttons should be
- Bad: In the
Local Changes
page, theAmend
checkbox has disappeared, and theCommit
andCommit & Push
buttons are replaced by aContinue
button and a menu with the optionCommit (edit)
- Editing is supposed to be like working on a branch, except that you cannot rebase because there is already a rebase going on. Some example of its uses: amending the edited commit, creating a new commit after the edited one, splitting the edited commit (and maybe also some before it) by resetting to an older commit then creating better commits with those changes. Then once you're done, you tell the rebase to continue so that it applies the later commits on top of the changes
- For that reason, the page should be as usual, allowing the user to stage/commit/amend
- That being said, removing the
Commit & Push
button does make sense because pushing during a rebase is an error (although you could keep it and let the user deal with the error message), and renaming theCommit
button toCommit (edit)
is not a bad idea
Cyrillev91
Metadata
Metadata
Assignees
Labels
enhancementNew feature or requestNew feature or request