Sometimes you need rewrite history with a rebase, but git push complains about doing so because you rewrote history.
This can be solved with a git push --force, but consider git push --force-with-lease, indicating that you want the push to fail if the local remote-tracking branch differs from the b...