Force-reset local progress branch to remote before worktree add

Author: trask

.github/scripts/flaky-test-fix/run-local.sh

@@ -248,11 +248,12 @@ PROGRESS_DIR="$OUT_DIR/progress-checkout"
 rm -rf "$PROGRESS_DIR"
 echo "==> Recording $CLASS.$METHOD on $PROGRESS_BRANCH"
 git fetch "$REMOTE" "$PROGRESS_BRANCH" --quiet
-git worktree add --quiet --detach "$PROGRESS_DIR" "$REMOTE/$PROGRESS_BRANCH"
+# Force-reset any stale local branch to match remote; otherwise a previous
+# local copy can diverge and cause non-fast-forward on push.
+git branch -f "$PROGRESS_BRANCH" "$REMOTE/$PROGRESS_BRANCH"
+git worktree add --quiet "$PROGRESS_DIR" "$PROGRESS_BRANCH"
 (
   cd "$PROGRESS_DIR"
-  git switch -c "$PROGRESS_BRANCH" >/dev/null 2>&1 || \
-    git switch "$PROGRESS_BRANCH" >/dev/null 2>&1
   printf '%s.%s\n' "$CLASS" "$METHOD" >> attempted.txt
   git add attempted.txt
   git commit -q -m "Mark $CLASS.$METHOD as attempted"