Let\'s suppose that I get a merge conflict on foo/bar.txt when running this:
foo/bar.txt
$ git checkout A $ git merge B
I\'d like to automatic
You can specify the merge strategy option ours to the recursive (the default) merge strategy. It will do a normal merge, but in case of conflicting hunks will choose the version of the current branch.
ours
recursive
git checkout A git merge -Xours B