title: How to get a github branch to accept changes pushed from other branches but it keeps saying that there is nothing to commit?
body: <p>Here's the story.</p>
  <p>We have two branches.  Development, and then Master.  On Github, it's setup so we can only push from local to development on github and then we can only merge to master from github, and then we push to heroku from master.</p>
  <p>We merged two branches to development, and then to master, and then pushed to Heroku.  One of the branches had a huge error we didn't catch in development.</p>
  <p>So we reverted heroku back to what we had before (no problem).  But trouble arose when we started trying to roll back and revert the other branches.</p>
  <p>Now, it's a mess.  And we tried a lot of things to fix it, all with no success.</p>
  <p>Fast forward to right now: we got the development branch back of the code that worked, and tried to remerge that to master.  However, github said there were no differences, and thus no way to commit the changes.  However, when we look at the code on github for each branch, development had the code, and master did not.  So why is github telling us there are no differences?</p>
  <p>Next, we reverted that development branch and tried to delete that development branch too.  We then tried to create the pull request again from scratch on development, and pushed it to github.  However, now it is telling us that again, there are no changes, so we can't merge to development.</p>
  <p>We don't know what to do.  We can't seem to use the old branches.  We can't seem to recode the branches from scratch.  It seems github thinks some code that is there is not there, and other code that is not there, Github thinks is there.  Any ideas how we can resolve this?</p>