chill out, state monster

ci-tools/update-nixpkgs

@@ -38,7 +38,8 @@ TARGET_BRANCH="nixpkgs-upgrade-$(date +%Y-%m-%d)"
 echo '{}' > morph/grid/local/public-keys/users.nix
 # nix-build -A morph -o result-before
 
-git checkout "${TARGET_BRANCH}" || git checkout -b "${TARGET_BRANCH}"
+git branch -d "${TARGET_BRANCH}" || true
+git checkout -b "${TARGET_BRANCH}"
 
 # Spawn *another* nix-shell that has the *other* update-nixpkgs tool.  Should
 # sort out this mess sooner rather than later...