I committed my code and when I do a git pull I found some conflicts. How do I solve the conflicts and only get the file version from pulling without my committed changes?
I committed my code and when I do a git pull I found some
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 committed my code and when I do a git pull I found some conflicts. How do I solve the conflicts and only get the file version from pulling without my committed changes?
You can hard reset your branch to the commit before your changes, and then cherry pick each of the subsequent commits. This will bring your branch to a state that includes everything except for your changes.