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

If you have fixed the conflicts you need to add the files to the stage with git add [filename], then commit as normal.