title: Git merge and resolve any conflicts to current branch
body: <p>So I have my master branch, along with branch 'bob'.</p>
  
  <p>I've made many changes in both and now I want merge master into bob to keep him updated. The only thing is, if there is a conflict I want it to automatically resolve to bob.</p>
  
  <p>I've been recommended the following:</p>
  
  <pre><code>git checkout bob
  git merge master -s ours
  </code></pre>
  
  <p>This does not work because I don't even get the changes from master that don't conflict.</p>
  
  <p>please help!</p>