diff options
| author | Ben Sima <ben@bsima.me> | 2025-11-20 19:51:38 -0500 |
|---|---|---|
| committer | Ben Sima <ben@bsima.me> | 2025-11-20 19:51:38 -0500 |
| commit | 8ca6b47fc236dc5c66d0cc4dd82c323bef9092fe (patch) | |
| tree | 323fa26c99f8049f1b90b75d65545e6d768ebd68 | |
| parent | 561d7931c6e03ac8474abdf4ee7c8edf5eb8546f (diff) | |
doc: switch worker to rebase workflow
- Use 'git rebase' instead of 'git merge' to maintain linear history -
Aligns with git-branchless patch-based philosophy
| -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 |