git needs merge error: you need to resolve your current index first error code example

git reset --merge