Repository navigation
docs: check a worktree is on the latest origin/main before starting - #533
Merged
Merged
Conversation
The WorktreeCreate hook branches from a freshly fetched origin/main, but a worktree made any other way is cut from whatever the main checkout was last pulled to. One started 68 commits behind main with nothing flagging it. Fetch and compare before reading code, and rebase before pnpm install.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Adds a rule to CLAUDE.md's worktree section: before any work in a worktree, fetch and run
git rev-list --count HEAD..origin/main, and rebase ontoorigin/mainif it is behind, before reading code, editing, or runningpnpm install.The
WorktreeCreatehook inworktrees-pnpmalready branches from a freshly fetchedorigin/main, but a worktree made any other way (by hand, another tool, a session board) is cut from whatever the main checkout was last pulled to. One started 68 commits behindmainthis week, and nothing flagged it.Docs only; no changeset.