Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
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.
If you have fixed the conflicts you need to add the files to the stage with
git add [filename], then commit as normal.