fix: treat broken remote Git repositories correctly (create backup, try to merge, do fresh clone if necessary)