git error needs merge

C++
git reset --merge

Source

Also in C++: