Git: Handling a force push to master