Skip to content

task-observer: new-session updates from 2026-05-15#20

Open
divad12 wants to merge 1 commit into
masterfrom
task-observer/new-session-2026-05-15
Open

task-observer: new-session updates from 2026-05-15#20
divad12 wants to merge 1 commit into
masterfrom
task-observer/new-session-2026-05-15

Conversation

@divad12
Copy link
Copy Markdown
Owner

@divad12 divad12 commented May 15, 2026

Target

skill: .agents/skills/new-session/SKILL.md

Observations addressed

  • Observation 12 (journology/log.md): Reuse existing clean worktrees before creating another → added: "Worktree recovery" section with git worktree list inspection step and fast-forward reuse pattern before creating a new worktree

Generated by Claude Code

Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 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>
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge 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 👍 / 👎.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant