title: Force my local master to be origin/master
body: <p>I've let master and origin/master get stuck in the sidelines, and am no longer interested in the changes on that branch.</p>
  
  <p>I followed these instructions to get my local master pointing to the right place
  <a href="https://stackoverflow.com/questions/2763006/change-the-current-branch-to-master-in-git">Make the current git branch a master branch</a></p>
  
  <pre><code> git checkout better_branch
   git merge --strategy=ours master    # keep the content of this branch, but record a merge
   git checkout master
   git merge better_branch             # fast-forward master up to the merge
  </code></pre>
  
  <p>which worked fine except git status gives</p>
  
  <pre><code>C:\data\localprojects\Beko2011Azure [master]&gt; git status
  
  # On branch master
  # Your branch and 'origin/master' have diverged,
  # and have 395 and 2 different commits each, respectively.
  #
  nothing to commit, working directory clean
  </code></pre>
  
  <p>so how do I now persuade origin/master (github) to reflect my master. Anything orphaned on origin/master can be safely abandoned.</p>