In a merge with conflicts, is there a way to tell git to keep one version for a set of files?
$ git checkout some_branch
$ git merge origin/master
$ ?
In a merge with conflicts, is there a way to tell git to keep
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.
In a merge with conflicts, is there a way to tell git to keep one version for a set of files?
$ git checkout some_branch
$ git merge origin/master
$ ?
If you’ve already attempted the merge and are looking at the unmerged files, you can use git checkout:
(and of course,
--ourskeeps the version from the current branch)