Git: Handling a forced push to a branch