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.
Is it possible to merge a branch into a current branch in git and accept HEAD for all merge conflicts? Basically this says I know what I’m doing and don’t care what’s in the other branch I’m merging in, accept everything from HEAD of the current branch and do not complain about merge conflicts.
From the documentation for git merge: