Help us improve
Share bugs, ideas, or general feedback.
npx claudepluginhub jugrajsingh/skillgarden --plugin gitmasteryHow this skill is triggered — by the user, by Claude, or both
Slash command
/gitmastery:finishingThis skill is limited to the following tools:
The summary Claude sees in its skill listing — used to decide when to auto-load this skill
Complete the current git-flow branch.
Guides technical evaluation of code review feedback: read fully, restate for understanding, verify against codebase, respond with reasoning or pushback before implementing.
Share bugs, ideas, or general feedback.
Complete the current git-flow branch.
/gitmastery:finish # Auto-detect branch type
/gitmastery:finish --tag # For release/hotfix with tag
git branch --show-current
git status --short
Feature/Bugfix:
git flow finish # Merges to develop, deletes branch
Release/Hotfix:
git flow finish --no-verify --tag -m "v<version> - Release notes"
Note:
--no-verifyskips pre-commit hooks on the merge commit. This is safe because the merge is mechanical — all code was already validated when committed to the release branch.
git push origin develop
git push origin main --tags # For release/hotfix
| Branch Type | Finish Action |
|---|---|
| feature/* | Merge to develop |
| bugfix/* | Merge to develop |
| release/* | Merge to main + develop, create tag |
| hotfix/* | Merge to main + develop, create tag |
Present via AskUserQuestion:
If conflicts occur:
git add <resolved-files>git flow finish --continue (retry)If finish fails with "a merge is already in progress", git-flow-next has stale state:
# Check the state file
cat .git/gitflow/state/merge.json
# Clear it (safe if the merge was already completed manually)
rm .git/gitflow/state/merge.json
Then retry git flow finish.