Hi, I'm trying to push some changes to github using RubyMine. I've committed the changes but when I try to push them I get this error message:
"error: failed to push some refs to 'g...@github.com:l...etc" So I tried pulling from github and it says this: You have not concluded your merge (MERGE_HEAD exists). Please, commit your changes before you can merge. What am I supposed to do? Thanks! -- You received this message because you are subscribed to the Google Groups "GitHub" group. To post to this group, send email to github@googlegroups.com. To unsubscribe from this group, send email to github+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/github?hl=en.
