diff options
Diffstat (limited to 'Omni/Agent/WORKER_AGENT_GUIDE.md')
| -rw-r--r-- | Omni/Agent/WORKER_AGENT_GUIDE.md | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Omni/Agent/WORKER_AGENT_GUIDE.md b/Omni/Agent/WORKER_AGENT_GUIDE.md index 5bae08f..938c98e 100644 --- a/Omni/Agent/WORKER_AGENT_GUIDE.md +++ b/Omni/Agent/WORKER_AGENT_GUIDE.md @@ -106,10 +106,14 @@ The Planner Agent (running in the main repo) will: 2. **Find Reviews**: Run `task list --status=review`. 3. **Review Code**: * Check out the feature branch: `git checkout task/t-123`. + * **Rebase onto Live**: Ensure the branch is up-to-date and linear. + ```bash + git rebase live + ``` * Run tests and review code. 4. **Merge**: * `git checkout live` - * `git merge task/t-123` + * `git merge task/t-123` (This will now be a fast-forward or clean merge) 5. **Complete**: * `task update t-123 done` * `git commit -am "task: t-123 done"` |