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.
Whenever I try to push in Git I get this:
You have not concluded your merge (MERGE_HEAD exists).
Please, commit your changes before you can merge.
Running git status I get:
# On branch master
nothing to commit (working directory clean)
Or running git ls-files -u I get nothing.
Running git add .and trying again makes no difference.
What’s up?
Okay I finally found answer:
git commit -m "Test"apparently fixed this. The result was an empty commit with no changes whatsoever. Even Github shows an empty commit, but it works.