Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .claude-plugin/marketplace.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down Expand Up @@ -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"
}
Expand Down
3 changes: 2 additions & 1 deletion .claude/rules/worktree-conventions.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 <branch>` 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
Expand Down
2 changes: 1 addition & 1 deletion git-standards/.claude-plugin/plugin.json
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion git-workflows/.claude-plugin/plugin.json
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Loading