Geek asks and answers

Git: merge branch and accept HEAD for all conflicts

Is it possible to merge a branch into the current branch in git and accept HEAD for all merge conflicts? It basically says that I know what I'm doing, and I don't care that in the other branch I am merging in, I accept everything from the HEAD of the current branch and do not complain about merge conflicts.

+3
source share
1 answer

From the documentation for git merge:

$ git merge -s ours <branch name>
+7
source

More articles:


All Articles