I also then squash and edit my commits and re-write the history on my forked github branch.