title: Git Rebase merge auto take
body: <p>I have</p>
  
  <pre><code>              G---H---I---J    Develop
               /
  A---B---C---D---E---F    Master
  </code></pre>
  
  <p>I want to rebase Develop with master, so:</p>
  
  <pre><code>                      G---H---I---J    Develop
                       /
  A---B---C---D---E---F    Master
  </code></pre>
  
  <p>So if I do <code>git checkout develop &amp; git rebase master</code></p>
  
  <p>It will do the rebase, however, at each commit where it finds a merge conflict it will stop.</p>
  
  <p>I'm happy just to take everything from develop and overwrite with that. There have been massive changes with develop but each commit builds and passes all tests, so I can assume if I just overwrite everything in master it should be fine.</p>
  
  <p>So how do I say something like <code>git rebase master --choose develop side</code> </p>