diff options
| author | Ben Sima <ben@bsima.me> | 2025-11-20 17:50:27 -0500 |
|---|---|---|
| committer | Ben Sima <ben@bsima.me> | 2025-11-20 17:50:27 -0500 |
| commit | bcc416959deeb4bcd5ce12d00807b7e673a6d0dd (patch) | |
| tree | 1773332e140f109acff1e38773783fc8737a611b | |
| parent | fa2eba4ab4dd6f495fa1838fc7f5bab2a8160fb8 (diff) | |
fix: prevent data loss in worker loop
- Changed 'git reset --hard' to 'git merge' in worker guide - This
prevents the worker from wiping its own status updates (commits to
base branch) when starting a new task loop
| -rw-r--r-- | Omni/Agent/WORKER_AGENT_GUIDE.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Omni/Agent/WORKER_AGENT_GUIDE.md b/Omni/Agent/WORKER_AGENT_GUIDE.md index 5797d85..5d39ab5 100644 --- a/Omni/Agent/WORKER_AGENT_GUIDE.md +++ b/Omni/Agent/WORKER_AGENT_GUIDE.md @@ -22,10 +22,10 @@ The Worker Agent should run the following loop continuously: # Go to worker directory cd ../omni-worker-1 -# Reset base branch to latest live code -# This ensures we build on top of the latest merged work +# Update base branch with latest live code +# We use merge to preserve any local status updates we haven't harvested yet git fetch origin live -git reset --hard origin/live +git merge origin/live --no-edit # Sync tasks from the live branch ./Omni/Agent/sync-tasks.sh |