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 that point I did a git pull which made some files with conflict highlighted. I removed the conflicts but I don’t know what to do from here.
I tried to git commit again but it says the “commit is not possible because you have unmerged files”:
error: Committing is not possible because you have unmerged files.
