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 have started a new project on Google code, and I chose Mercurial as VCS. I forced a push over the remote repository, since it created two heads, problem is: now I don’t know how to merge this two heads on the remote repository!
Please help, it’s my first time with Mercurial, and I want it to be as painless as possible 😉
Oh, and forgive the succynthness of my question. If extra information is needed, tell me.
Thanks.
No problem. Just clone that repo to a new clone locally (now you’ll have two heads), do a
hg mergelocally followed by ahg commitlocally (now you’ll have one head locally) and thenhg pushto remote (now you’ll have one head remotely).That merge changeset you’re creating when you merge has two parents, so it removes a head for whomever has it.