diff options
| -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 |