I am performing a git pull from my master branch to one local machine with my application and it is giving me a merge conflict error in my Gemfile lock.
How can i go about this?
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 am performing a git pull from my master branch to one local machine with my application and it is giving me a merge conflict error in my Gemfile lock.
How can i go about this?
You changed your version of the Gemfile. Someone else changed the same Gemfile on master.
Now git has no way to decide whether you want to keep your version, or if you want to go with the master version, or only partly go with the master version.
Did you change your Gemfile on purpose?
If yes, probably
git mergetoolwill help you solving your conflicts.If no, you can simply throw away all your changes with
git reset --hard @{u}.