Git merge error “commit is not possible because you have unmerged files”

Question

I forgot to git pull my code before editing it; when I committed the new code and tried to push, I got the error "push is not possible".

At tha

Answer 1

I've had a similar issue which boiled down to removing files under "unmerged paths"

Those files had to be removed using git rm