| You need 'push -f' to force overwriting the old version of your | branch. Please make sure you are not forcefully pushing while on | master branch, though. ;) (I seem to remember 'push -f' can be blocked Right! I'm on branch wip/new-flatten-skolems-Oct14, so git push --force should push just that branch right? If I want to be super-safe, and say "push only this branch" would I say git push --force HEAD or git push --force wip/new-flatten-skolems-Oct14 or something like that? S | -----Original Message----- | From: Mikolaj Konarski [mailto:mikolaj@well-typed.com] | Sent: 31 October 2014 11:24 | To: Simon Peyton Jones | Cc: ghc-devs@haskell.org | Subject: Re: git question | | > Now I want to rebase to clean up. Can I just do a local rebase and | > then git push? Nothing special about the push? | | You need 'push -f' to force overwriting the old version of your | branch. Please make sure you are not forcefully pushing while on | master branch, though. ;) (I seem to remember 'push -f' can be blocked | on master, but I don't know if it is in our repo.) | | > I know that will confuse anyone who is pulling from that branch, but | > I’ve warned them! | | If they do 'git fetch', they can compare the old and the new version | of the branch and mix and match at will.