diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json index a127bb6..884d427 100644 --- a/.claude-plugin/marketplace.json +++ b/.claude-plugin/marketplace.json @@ -31,7 +31,7 @@ "name": "git-workflows", "source": "./git-workflows", "description": "Git worktree initialization, main branch sync, repository refresh, and troubleshooting workflows", - "version": "1.0.0", + "version": "1.0.1", "author": { "name": "JacobPEvans" } @@ -94,7 +94,7 @@ "name": "git-standards", "source": "./git-standards", "description": "Git workflow standards, branch hygiene, PR creation guards, and issue linking", - "version": "1.0.0", + "version": "1.0.1", "author": { "name": "JacobPEvans" } diff --git a/.claude/rules/worktree-conventions.md b/.claude/rules/worktree-conventions.md index d372690..11575d4 100644 --- a/.claude/rules/worktree-conventions.md +++ b/.claude/rules/worktree-conventions.md @@ -24,9 +24,10 @@ Examples: 1. Switch to main and sync: `cd ~/git/{repo-name}/main && git switch main && git pull` 2. Clean stale worktrees (merged PRs or `[gone]` remote branches): - - `gh pr list --state merged --head ` to confirm PR was merged + - `gh pr list --state merged --head {branch}` to confirm PR was merged - `git branch -vv | grep '\[gone\]'` to find deleted remote branches - `git worktree remove {path}` (never `--force`) + `git branch -d {branch}` + - If `git branch -d` fails (branch not merged locally, e.g. squash-merge), investigate before using `git branch -D` - `git worktree prune` to clean up ## After Creating diff --git a/git-standards/.claude-plugin/plugin.json b/git-standards/.claude-plugin/plugin.json index 5af111d..e407436 100644 --- a/git-standards/.claude-plugin/plugin.json +++ b/git-standards/.claude-plugin/plugin.json @@ -1,6 +1,6 @@ { "name": "git-standards", - "version": "1.0.0", + "version": "1.0.1", "description": "Git workflow standards, branch hygiene, PR creation guards, and issue linking", "author": { "name": "JacobPEvans" diff --git a/git-workflows/.claude-plugin/plugin.json b/git-workflows/.claude-plugin/plugin.json index efa7a22..929c06d 100644 --- a/git-workflows/.claude-plugin/plugin.json +++ b/git-workflows/.claude-plugin/plugin.json @@ -1,6 +1,6 @@ { "name": "git-workflows", - "version": "1.0.0", + "version": "1.0.1", "description": "Git main branch sync, repository refresh, and PR merge workflows", "author": { "name": "JacobPEvans"