If you ever force push with git, you should really use --force-with-lease to avoid accidental clobbering. If you use magit, it's automatic!