diff options
Diffstat (limited to 'Omni/Agent')
| -rw-r--r-- | Omni/Agent/WORKER_AGENT_GUIDE.md | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Omni/Agent/WORKER_AGENT_GUIDE.md b/Omni/Agent/WORKER_AGENT_GUIDE.md index 782d4d5..af81bb0 100644 --- a/Omni/Agent/WORKER_AGENT_GUIDE.md +++ b/Omni/Agent/WORKER_AGENT_GUIDE.md @@ -23,8 +23,10 @@ The Worker Agent should run the following loop continuously: cd ../omni-worker-1 # 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 +# We use rebase to keep history linear (patch-based workflow) +# The custom merge driver handles tasks.jsonl conflicts during rebase +git fetch origin live +git rebase origin/live # Sync tasks from the live branch ./Omni/Agent/sync-tasks.sh |