title: Merging two branches, how do I accept one branch for all conflicts
body: <p>Im merging two branches together, lets say branchA and branchB.  They have about 100 files that conflict.</p>
  
  <p>branchB has the accepted work for everything and is 100% what I need. I don't want to force push branchB or anything.</p>
  
  <p>Is there a way I can merge the two and just say for any conflict accept whats on branchB so I don't have to open the files or "theirs" or "ours" every single file.</p>
  
  <p>was trying a recursive merge from branchB pulling branchA with the -s and -x option in but that didnt seem to work as expected</p>
  
  <p>thanks</p>