diff options
Diffstat (limited to 'Omni/Agent')
| -rwxr-xr-x | Omni/Agent/start-worker.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Omni/Agent/start-worker.sh b/Omni/Agent/start-worker.sh index 5607f6d..eb096b7 100755 --- a/Omni/Agent/start-worker.sh +++ b/Omni/Agent/start-worker.sh @@ -55,7 +55,9 @@ while true; do # A. Sync with Live # We use 'git rebase' to keep history linear - git checkout omni-worker-1 >/dev/null 2>&1 + # Force checkout to clean up any untracked files from previous runs + git checkout -f omni-worker-1 >/dev/null 2>&1 + # Rebase directly on local live branch (shared repo) if ! git rebase live >/dev/null 2>&1; then echo "Warning: Rebase conflict at start of loop. Aborting rebase and proceeding with local state." |