Give these a shot--you probably need to resolve a merge attempt. http://www.btaz.com/scm/git/git-fatal-you-have-not-concluded-your-merge-merge_head-exists/ http://lists.zerezo.com/git/msg692855.html
Timothy On Mar 25, 2:14 pm, Mlle <[email protected]> wrote: > 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 '[email protected]: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 [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/github?hl=en.
