Strangely, Open AI has a promo video for this model where they claimed that this problem is solved...
12 karma · joined June 30, 2011
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.
http://www.macrumors.com/2012/02/09/steve-jobs-1991-fbi-file...