[rebase] Disable Abort button after first click
See original GitHub issueI noticed that you can click the Abort
button (during a rebase conflict) more than once, which leads to a A lock file already exists in the repository, which blocks this operation from completing.)
error surfacing. Perhaps we need to disable it, although I am have no strong feels on this bug as it is unlikely to happen and the recovery is easy.
Repro:
- pull up Rebase conflict
- double or triple-click Abort button
Tried to repro it on merge conflict flow, but could not.
8b061eac07, mac
Issue Analytics
- State:
- Created 5 years ago
- Comments:5 (5 by maintainers)
Top Results From Across the Web
Completely cancel a rebase - Stack Overflow
I got my branch back to the state it was, but I received this message when I type git status: # You are...
Read more >Need an option to disable "REBASE" button - GitLab.org
We would need an option to remove the "rebase" button in MR. The reason is that when you restrict the push to be...
Read more >Rebase control buttons in Interactive Rebase view are disabled
I first started the rebase via right-click on the project > Team ... "Skip" and "Abort" buttons disabled, however the context menu "Team...
Read more >git-rebase Documentation - Git
git-rebase - Reapply commits on top of another base tip ... In case of conflict, git rebase will stop at the first problematic...
Read more >"Git Changes" window stuck in "Rebase in progress" state ...
Call git rebase -i on the cmdline; Waited for the editor to show me the ... all buttons disabled; Go back to cmd...
Read more >Top Related Medium Post
No results found
Top Related StackOverflow Question
No results found
Troubleshoot Live Code
Lightrun enables developers to add logs, metrics and snapshots to live code - no restarts or redeploys required.
Start FreeTop Related Reddit Thread
No results found
Top Related Hackernoon Post
No results found
Top Related Tweet
No results found
Top Related Dev.to Post
No results found
Top Related Hashnode Post
No results found
Top GitHub Comments
@tierninho @billygriffin #7117 has the changes to disable when aborting a rebase (both cases) - in particular https://github.com/desktop/desktop/pull/7117/commits/81f49bf4acc48753af65deecb214ea8694881e0b and https://github.com/desktop/desktop/pull/7117/commits/1b7363871c6572c33148a031d48580ddb9366b83. Once those land in
development
I’ll update this issue to indicate that Merge Conflicts is the only remaining work, which makes me think it can be dropped from the milestone.No, tried to repro it on merge conflict flow but couldn’t.