push -f is the thing. Requiring -f just makes you think twice before accidentally exposing the rest of the world to your changes without merging them.