Today's developer cycle... $ git rebase --onto origin/master origin/master $ ... argh ... $ git rebase --abort $ sleep 60 repeat.