From f2baa51303f0d7d302e397357b02da0188b30fd7 Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Thu, 20 Nov 2025 21:28:54 -0500 Subject: fix(worker): force checkout to overwrite untracked files --- Omni/Agent/start-worker.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Omni/Agent/start-worker.sh') diff --git a/Omni/Agent/start-worker.sh b/Omni/Agent/start-worker.sh index 1aaba7f..820c1bb 100755 --- a/Omni/Agent/start-worker.sh +++ b/Omni/Agent/start-worker.sh @@ -87,7 +87,9 @@ while true; do BRANCH_NAME="task/$TASK_ID" if git show-ref --verify --quiet "refs/heads/$BRANCH_NAME"; then echo "Resuming existing branch $BRANCH_NAME" - git checkout "$BRANCH_NAME" >/dev/null + # Force checkout to overwrite untracked files (like .tasks/counters.jsonl) + # that may have been generated by sync tools but are tracked in the branch. + git checkout -f "$BRANCH_NAME" >/dev/null else echo "Creating new branch $BRANCH_NAME" git checkout -b "$BRANCH_NAME" >/dev/null -- cgit v1.2.3