Git: Recover from failed rebase
问题 I just tried to rebase one of my feature-branches and something went wrong - now i am trying to figure out how to undo this. Being on my feature-branch i simply did a: git rebase develop after committing a bugfix on develop which i wanted in the feature-branch as well. This gave me: $ git rebase develop First, rewinding head to replay your work on top of it... Rename from '.git/HEAD.lock' to '.git/HEAD' failed. Should I try again? (y/n)? n error: Couldn't set HEAD fatal: Cannot update the ref