How can I merge all the changes from 1 branch to another

Question

In git, what is the easiest way for me to merge all changes (multiple commits) from 1 branch to another branch?

Thank you.

Answer 1

git checkout branchA
git merge -Xtheirs branchB 

(For git1.7.1+)

Other older alternatives are presented in "git merge -s ours, what about “their”"