Suppose you're merging in branch A and you have a TON of conflicts.
Not only is it going to take you forever, but the worst part is that for this particular merge, in every conflict, you're just going to reject branch A's version and side with the current branch.
Luckily, there's a way to avoid this headache-inducing tedium!
If you're merging in a branch and for all the conflicts, you're going to side with the same one branch, just specify a strategy (which branch to side with).
In our case, we side with our current branch:
git merge A -X ours
In the reverse case, we side with A's version in every conflict:
git merge A -X theirs