Nicholas Hopper

Git worktree delivery

Git worktree delivery is the process of landing work from several parallel git worktrees, each used by a different AI agent session, onto one main branch. Nicholas Hopper wrote a delivery procedure that proves no agent's commit was lost.

The problem

Running several coding agents at once means several worktrees of the same repository, each with commits the others have not seen. Merging them by hand, or letting an agent decide what matters, loses work.

Nicholas Hopper’s procedure

At APX Stream, Hopper wrote the procedure as an agent skill. Its steps:

  1. Inventory first. Record every worktree and every commit not yet on the main branch. The inventory does not change after it is taken.
  2. Merge everything. Every inventoried commit is merged. There is no filter for size or importance.
  3. No history rewriting. Reset, stash, clean, rebase and force push are banned outright.
  4. Stop for human work. If the integration worktree holds uncommitted changes made by a person, the agent stops and asks.
  5. Prove it. At the end, the agent shows that each inventoried commit is an ancestor of the result.

Related skills