ux(orchestrate): reconcile can't check out a PR head held by a linked worktree — advice says fetch/recreate instead of naming the worktree #24

New issue

Closed

opened 2026-07-11 21:52:52 +00:00 by hexajon · 0 comments

hexajon commented

2026-07-11 21:52:52 +00:00

(Migrated from codeberg.org)

Hit live 2026-07-10 (an earlier PR): madt_orchestrate reconcile=<pr> failed with '<branch>' is already used by worktree at '.worktrees/<branch>' and advised "make sure it exists locally (madt_fetch, then create it from origin/...)" — but the branch existed; the actual fix was removing the worktree (or reconciling inside it).

Ask: when checkout fails because the head branch is checked out in a linked worktree, either (a) run the reconcile inside that worktree directly, or (b) say exactly that: "checked out in worktree X — remove it (madt_worktrees action=remove) or reconcile there." The current advice sends the caller down a fetch/recreate path that can't work.

Hit live 2026-07-10 (an earlier PR): `madt_orchestrate reconcile=<pr>` failed with `'<branch>' is already used by worktree at '.worktrees/<branch>'` and advised "make sure it exists locally (madt_fetch, then create it from origin/...)" — but the branch existed; the actual fix was removing the worktree (or reconciling inside it). Ask: when checkout fails because the head branch is checked out in a linked worktree, either (a) run the reconcile inside that worktree directly, or (b) say exactly that: "checked out in worktree X — remove it (madt_worktrees action=remove) or reconcile there." The current advice sends the caller down a fetch/recreate path that can't work.

No milestone

No project

No assignees

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

sixfold-space/madtea#24

No description provided.

Rows
Columns