title: Making changes to git pull request locally, after numerous merge conflicts resolved in Github GUI
body: <p>I've got a pull request I've been trying to get merged.  The first time I submitted it, there ended up being a merge conflict first, and in the process of trying to fix it locally, I ended up "dirtying" up the PR with dozens of other people's commits ending up in there, rather than the 1 or 2 cleanly rebased &amp; squashed commits that were originally there.</p>
  
  <p>I closed the PR, I dug through the diffs and recreated the branch &amp; PR based off the newer upstream master, and it's been sitting for about a week.  In the meanwhile, there were two merge conflicts I resolved ON GITHUB, such that in the commit history, its clean and shows just my initial squashed commit, and the two force-pushed resolved conflicts.</p>
  
  <p>The maintainer has asked me to make a couple easy changes before merging, but I want to avoid the mess I made the first time. At his suggestion, I deleted my LOCAL branch, and pulled it from my fork again, but it's showing up one commit short for some reason, without the newest merge conflict resolved.</p>
  
  <p>I'm so confused truth be told, and I just can't figure out how I'm supposed to do this.  Can anyone help me out?</p>
  
  <p>Here is the PR:
  <a href="https://github.com/WikiEducationFoundation/WikiEduDashboard/pull/3481/" rel="nofollow noreferrer">https://github.com/WikiEducationFoundation/WikiEduDashboard/pull/3481/</a></p>
  
  <p>Here is my local fork, selected to the appropriate feature branch where I did all the work:
  <a href="https://github.com/chrisnorwood/WikiEduDashboard/tree/feature/convert-alerts-list-to-react-2" rel="nofollow noreferrer">https://github.com/chrisnorwood/WikiEduDashboard/tree/feature/convert-alerts-list-to-react-2</a></p>
  
  <p>I deleted my local branch and repulled it with the following command:
  <code>git co -b feature/convert-alerts-list-to-react-2 origin/feature/convert-alerts-list-to-react-2</code></p>
  
  <p>When I run <code>git log</code> on the newly pulled branch, it shows <code>51cc7be50...</code> as the latest commit (Nov. 15th), but not <code>a029135e42...</code> (Nov 21) as shown on Github.com ....  is that weird?</p>
  
  <p><strong>How can I get the correct version of the branch, with all relevant commits locally, so when I push to my fork again, the PR is updated without showing like 50+ other people's commits in there????</strong></p>