[4b11b4]

Lately I just use an isolated worktree per conversation and I have all these threads sitting which need to be merged then I just let codex orchestrate that itself.

I tell each thread to name itself with a prefix and it's picked up by a merge queue thread which instructs them merge one at a time. Each thread has to look at the main ref as it's changed since they did their work and determine what kind of merge needs to happen. To safely merge a a variety of merge types I have a commit skill which details the process for forward reconstruction, for example.

As of yesterday I have a single voice orchestrator thread which then can poke other threads as well as the merge queue thread.

Sometimes I just do stuff in working copy when I know exactly where in the history it's going to land (I rewrite history extensively to know cleanly where that it) and I'll git absorb / jj absorb it manually.