Add pull-before-branch instruction to CLAUDE.md injection#26
Merged
Conversation
Instructs Claude to always pull latest main before creating a worktree or branch, avoiding stale-code rebases and merge conflicts. Bumps version to 0.5.1.
Prevents git pull from silently creating a merge commit if local main has diverged. --ff-only aborts cleanly, surfacing the problem instead.
josephfung
added a commit
that referenced
this pull request
Apr 28, 2026
Group pull-before-branch (PR #26) and issue tracker hygiene under a new 0.5.1 section. Mark 0.5.0 as released.
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.
Summary
settings/claude-md.mdso Claude always runsgit pull --ff-only origin mainbefore creating worktrees or branches--ff-onlyto fail cleanly if local main has diverged, rather than silently creating a merge commitTest plan
claude-md.batstests passinstall.shand verify the new section appears in~/.claude/CLAUDE.mdinside the TrimKit block