GitButler stacks (Agenta)

Everyday but usage — but status, but commit, but push, but absorb — is covered by the root AGENTS.md. This skill is the multi-lane layer: it only matters once you have a stack of branches, which is roughly 6% of the work here.

Read the first rule first. Most of what follows exists to undo damage that only happens when edits are made first and assigned to lanes afterward. Committing each change to its lane as you go avoids nearly all of it.

Prefer one lane at a time

Land a lane before starting the next. A single lane per session needs none of the machinery below — no --only staging discipline, no stash isolation, no oplog restores. Reach for a stack only when a change genuinely depends on another in-flight branch's commits.

Sync a lane with rebase, not merge. Merge commits between branches are what collapse a series (see the first hard-won gotcha).