task-observer: new-session updates from 2026-05-15#20
Conversation
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: dfbe10fd9d
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
|
|
||
| ```bash | ||
| # From the main checkout, advance the target branch | ||
| git checkout <target-branch> && git merge --ff-only origin/<target-branch> |
There was a problem hiding this comment.
Avoid checking out a branch already attached to a worktree
This recovery command will fail in the exact scenario this section targets: when a reusable worktree already has <target-branch> checked out. In Git, git checkout <target-branch> from the main checkout errors if that branch is already in another worktree (fatal: '<branch>' is already used by worktree ...), so the documented fast-forward path cannot run and the recovery flow stops. Update the instruction to fast-forward from the existing worktree path (or via a branch-ref update that does not require checking it out in main).
Useful? React with 👍 / 👎.
Target
skill:
.agents/skills/new-session/SKILL.mdObservations addressed
git worktree listinspection step and fast-forward reuse pattern before creating a new worktreeGenerated by Claude Code