I have a file in my GIT repository that I changed through the github.com editor.
Now, I went and change this file in my local repository aswell.
What is a common workflow for solving this? I cannot pull or push now.
Share
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 a file in my GIT repository that I changed through the github.com editor.
Now, I went and change this file in my local repository aswell.
What is a common workflow for solving this? I cannot pull or push now.
Now I do understand, you’re saying have changes both on GitHub and Locally. I am going to assume your local changes are committed – if not, you should either commit them or throw them away using
git reset --hard HEAD.In principle
git pullshould have pulled the remote changes down and merged them, but that is not working. If git is complaining about merge conflicts then you should resolve them by hand, commit the result and then push it up.If something stranger has happened, you can try the same approach. First grab the remote changes in a remote-tracking branch (i.e. not in your working directory),
git pullwill probably have done this for you (usegitk --allto find out). If not, play around withgit-fetchto try and grab more stuff). When you have what you want in a remote tracking branch, you can do agit mergeby hand.(Sorry if this is not very clear, but since I don’t know your exact errors, I have to guess).