title: How to make branch the same as origin/master
body: <p>suppose I branched from <code>origin/master</code> to <code>brancha</code>. </p>
  
  <p>I made, committed and pushed changes to <code>brancha</code> (this includes creating, committing and pushing new files). </p>
  
  <p>Now, I want to make <code>brancha</code> the exact same <em>content</em> as <code>origin/master</code> again (because, say my changes were wrong and a better solution was put on <code>master</code>). </p>
  
  <p>So I want my branch to basically be a new branch off of <code>origin/master</code>, but <strong>I want my old changes to have been recorded</strong> so I can see it later on in the history.  </p>
  
  <p>Is there a way to do this?</p>