Menu
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?
506
After a git merge stops due to conflicts you can conclude the merge by running git merge --continue (see "HOW TO RESOLVE CONFLICTS" section below). Commits, usually other branch heads, to merge into our branch.
The traditional way of completing a merge after resolving conflicts is to use ' git commit '. Now with commands like ' git rebase ' and ' git cherry-pick ' having a ' --continue ' option adding such an option to ' git merge ' presents a consistent UI.
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.
84
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
