Issue –
You have a previous unsuccessful merge attempt.
Solution –
Either you can fix conflicts or You can ignore the unsuccessful merge. In this solution, we are going to ignore the unsuccessful merge and roll back to the previous state of code. Run below command
git reset --merge