Had this error:
error: cannot lock ref 'refs/remotes/origin/feature/SomeBranch': ref refs/remotes/origin/feature/SomeBranch is at SOME_SHA b ut expected SOME_OTHER_SHA
This fixed it:
rm .git/refs/remotes/origin/feature/SomeBranch
Developer from somewhere
Had this error:
error: cannot lock ref 'refs/remotes/origin/feature/SomeBranch': ref refs/remotes/origin/feature/SomeBranch is at SOME_SHA b ut expected SOME_OTHER_SHA
This fixed it:
rm .git/refs/remotes/origin/feature/SomeBranch