“It looks like git-am is in progress. Cannot rebase.”
Sounds familiar?
git rebase origin mfriedrich/ido
Well, having hard-canceled some git rebase on icinga lately, and left some history over there. Fix is easy.
rm -rf .git/rebase-apply
“It looks like git-am is in progress. Cannot rebase.”
Sounds familiar?
git rebase origin mfriedrich/ido
Well, having hard-canceled some git rebase on icinga lately, and left some history over there. Fix is easy.
rm -rf .git/rebase-apply