From d2c6915f9715d079f021660c22cc1fd39ed16bcd Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Thu, 20 Nov 2025 17:53:12 -0500 Subject: fix: merge local live branch in worker guide - We share the .git directory, so we can merge 'live' directly - Avoids dependency on 'origin' which might be stale or unused --- Omni/Agent/WORKER_AGENT_GUIDE.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Omni') diff --git a/Omni/Agent/WORKER_AGENT_GUIDE.md b/Omni/Agent/WORKER_AGENT_GUIDE.md index 5d39ab5..782d4d5 100644 --- a/Omni/Agent/WORKER_AGENT_GUIDE.md +++ b/Omni/Agent/WORKER_AGENT_GUIDE.md @@ -23,9 +23,8 @@ The Worker Agent should run the following loop continuously: cd ../omni-worker-1 # 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 merge origin/live --no-edit +# We merge the local 'live' branch directly since we share the git dir +git merge live --no-edit # Sync tasks from the live branch ./Omni/Agent/sync-tasks.sh -- cgit v1.2.3