How work lands / Page 35 of 70
This page is one part of The Ishoo manual. The complete manual is a single page, short enough to read in one go: ishoo.app/docs/
How work lands
Worktree changes merge back cleanly when each one is rebased onto the latest main just before it lands, one at a time. Ishoo's land call does that in one step: commit, rebase on main, move main forward, push, and record the landing with its note and tests.
Most trouble with parallel agents shows up at the end, when their work comes back. Merging each branch whenever it's ready leaves a tangle of merge commits and conflicts nobody planned for. Ishoo lands one change at a time, each rebased onto the newest main first, so main is a straight line and every conflict is met by the agent who caused it, while its work is still fresh.
What one call does#
Check main
If main is known to be broken, landing stops with the reason, unless this landing is the fix (
fixes_main) or the agent says it truly can't wait (ack_broken_main). Building on a broken main only buries the breakage.Commit
Whatever is in the worktree is committed, with the issue id and the note as the message. The agent doesn't have to commit first.
Catch up and rebase
Ishoo fetches main from the remote, brings the local main up to it, and rebases the issue's branch on top. The change now sits on the newest code.
Move main
Main moves forward to the rebased commit. Only a fast-forward: there are no merge commits.
Push
Main is pushed before anything is recorded, so a remote that only takes pull requests gets one, instead of a landing it never took.
Record
The issue is marked done with the note and tests as its result, a trace file is written, and the store syncs.
Clean up
The worktree is removed, the branch is deleted (its commits are on main now), and the claim is released.
The reply says what happened in one line, then anything worth knowing:
Landed DOCS-06 as f2157074e on main, 2 files, pushed; store synced.When the rebase conflicts#
Ishoo undoes the rebase at once, so the worktree is never left half-merged, and tells the agent where and who:
Rebase onto main conflicts in: src/sync.rs. Recently landed there: STOR-05 (agent-41c2).
Resolve in .ishoo/worktrees/SYNC-09 (git rebase main), then land again.The agent rebases in its own worktree, reads the other landing's note to understand what changed, resolves, and calls land again. Nothing reached main in the meantime, and no other agent was blocked.
When the push fails#
- Main only takes pull requests: the branch is pushed and a pull request opened instead. See Protected main and pull requests.
- Anything else (no network, no permission): the reply says NOT pushed and why. The landing is recorded on this computer and main moved here only; push main once the cause is fixed.
- No remote at all: the landing is recorded locally and the reply says it wasn't pushed. That's normal for a project that lives on one computer.
Tests, without waiting#
Land doesn't run your tests: that would make every agent wait on every other. The agent names the tests it ran in tests. If the project sets a quick check, the reply asks whether it passed when the tests don't mention it:
# ishoo.toml
[checks]
quick = "cargo clippy --all-targets && cargo test" # asked about at claim and land
full = "cargo test --workspace --all-features" # run on main by the nightly checkA landing that names no tests is allowed. It's counted in the untested chip, and the nightly check covers it. See Tests and the trace.