Take the 2-minute tour ×
Super User is a question and answer site for computer enthusiasts and power users. It's 100% free, no registration required.

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

Thank you.

share|improve this question
add comment

1 Answer

up vote 1 down vote accepted
git checkout branchA
git merge -Xtheirs branchB 

(For git1.7.1+)

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

share|improve this answer
add comment

Your Answer

 
discard

By posting your answer, you agree to the privacy policy and terms of service.

Not the answer you're looking for? Browse other questions tagged or ask your own question.