If you were to do a rebase and somehow it fails because of some application that was using the files you were trying to rebase, the rebase gets stuck in a corrupted state.
Doing a git rebase --abort results in the error:
warning: could not read '.git/rebase-merge/head-name': No such file or directory
I had to do the following operations to fix this:
git reset --hard HEAD
rm -rf .git/rebase-merge/
My question is if it is possible to detect that error and show some popup which the following buttons/options:
discard all and rebase -> will use that git reset + rm -rf combinationleave as is -> will use git rebase --quit to exit rebasing and leave things in the current state
If you were to do a rebase and somehow it fails because of some application that was using the files you were trying to rebase, the rebase gets stuck in a corrupted state.
Doing a
git rebase --abortresults in the error:I had to do the following operations to fix this:
My question is if it is possible to detect that error and show some popup which the following buttons/options:
discard all and rebase-> will use thatgit reset + rm -rfcombinationleave as is-> will usegit rebase --quitto exit rebasing and leave things in the current state