Menu
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.
982
From the documentation for git merge:
$ git merge -s ours <branch name>
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
