[oilytheotter]

Using rebase relative to HEAD can be tricky, and as others have mentioned, force pushing a branch is not usually a good idea.

When you are ready to submit a pull request, instead of rebasing the branch you have already pushed to origin, create a new branch called your_branch_name-final (I usually call the original branch -wip for for work in progress). Then, before pushing this branch to origin, run git rebase -i upstream/master.