I want to pull a project and resolve merge conflicts using my changes. How can I do 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 want to pull a project and resolve merge conflicts using my changes. How can I do this?
Use the recursive merge strategy with the ours option:
or
For any conflicts, it will use the hunk that comes from your branch. See the git merge man page for more details.