Git: Handling a force pushed branch (when it's been force pushed by someone else)