I have a pull request where my original commit wasn't passing tests. I didn't look at it for a while and came back to it after a number of months. During this time the upstream repo had done a bunch of commits, so I merged them into my repo. I then added a commit that fixed the broken tests.
I'd like to squash my pull request into a single commit. I have:
2102f91 <-- original commit from Jan 2015
c202023 <-- merge from upstream Feb 2016
df22e9c <-- commit to fix tests Feb 2016
Is it possible to squash this or is it easier to delete the branch and redo my pull request?