Skip to content

docs: git cherry cannot detect a squash-merged branch - #65

Merged
handamade merged 1 commit into
mainfrom
docs/branch-absorbed-check
Jul 31, 2026
Merged

docs: git cherry cannot detect a squash-merged branch#65
handamade merged 1 commit into
mainfrom
docs/branch-absorbed-check

Conversation

@handamade

Copy link
Copy Markdown
Owner

CLAUDE.md told you to use git cherry -v main <branch> to tell a squash-merged branch from one carrying real work. It cannot.

Under squash-merge the single squashed commit carries the combined diff, so its patch-id matches no individual commit on the branch. Every commit shows + — reading as "still carries work" when the branch is fully absorbed. Confirmed while cleaning up D58: all 13 commits showed +, while git diff main d58-menu-dismissal was empty.

git diff main <branch> answers the actual question directly: empty output means the content is fully in main and the branch is safe to delete.

Docs only — no code change, no changeset.

🤖 Generated with Claude Code

CLAUDE.md told you to use `git cherry -v main <branch>` to tell a
squash-merged branch from one carrying real work. It cannot: the squashed
commit's patch-id matches no individual commit, so every commit shows `+`
and a fully-absorbed branch reads as unmerged. Confirmed on D58's
13-commit branch, whose content was byte-identical to main.

`git diff main <branch>` answers it directly — empty means absorbed.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
@vercel

vercel Bot commented Jul 31, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
psi Ready Ready Preview Jul 31, 2026 11:52pm

@cursor

cursor Bot commented Jul 31, 2026

Copy link
Copy Markdown

Bugbot is not enabled for your account, so this pull request was not reviewed.

Enable Bugbot in the Cursor dashboard to get automatic reviews on future PRs.

@handamade
handamade enabled auto-merge (squash) July 31, 2026 23:51
@handamade
handamade merged commit 9301b99 into main Jul 31, 2026
3 checks passed
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