IF YOU RECEIVE THIS DURING REBESS:
This is most likely due to some software blocking your repo index file, such as backup software, antiviruses, IDEs, or other git clients.
In most cases, the lock is only performed for a short moment, and therefore it simply happens due to bad time and failure.
However, git rebase --continue will complain about the following command, which is an empty commit:
The previous cherry-pick is now empty, possibly due to conflict resolution. If you wish to commit it anyway, use: git commit
To fix this, just run git reset and try git rebase --continue .
qwertzguy Nov 16 '16 at 1:43 2016-11-16 01:43
source share