diff options
Diffstat (limited to 'Omni/Agent/WORKER_AGENT_GUIDE.md')
| -rw-r--r-- | Omni/Agent/WORKER_AGENT_GUIDE.md | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Omni/Agent/WORKER_AGENT_GUIDE.md b/Omni/Agent/WORKER_AGENT_GUIDE.md index ff33259..782d4d5 100644 --- a/Omni/Agent/WORKER_AGENT_GUIDE.md +++ b/Omni/Agent/WORKER_AGENT_GUIDE.md @@ -22,10 +22,9 @@ 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 -git fetch origin live -git reset --hard origin/live +# Update base branch with latest live code +# 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 @@ -56,9 +55,10 @@ task update t-123 in-progress * If you find an unmerged dependency branch, check it out: `git checkout task/t-parent-id`. * Otherwise, start from fresh live code: `git checkout omni-worker-1` (which tracks `live`). -4. **Create Feature Branch**: +4. **Create/Checkout Feature Branch**: ```bash - git checkout -b task/t-123 + # Try to switch to existing branch, otherwise create new one + git checkout task/t-123 || git checkout -b task/t-123 ``` ### Step 4: Implement |