npx claudepluginhub xantygc/agent-code-marketplace --plugin git-workflowgit-workflow/commands/## Context
- Current branch: !`git branch --show-current`
- Git status: !`git status`
- Unpushed commits: !`git log @{u}.. --oneline 2>/dev/null`
- All branches: !`git branch -a`
## Your task
Complete and merge the current feature/hotfix/release branch following Git Flow conventions.
1. **Verify the current branch type**:
- Feature branch: merge into develop
- Hotfix branch: merge into both main and develop
- Release branch: merge into both main and develop, then tag
2. **Pre-merge checks**:
- Ensure all changes are committed
- Ensure the branch is pushed to origin (if n.../finishCreates a pull request with comprehensive description following repo best practices, loading config, verifying git state, summarizing changes, gathering user input, pushing branch, and opening PR.
/finishInvokes jig:finish skill to finalize tasks when implementation is complete, all tests pass, and a decision is needed.
/finishRun the full completion pipeline — build, commit, simplify, commit, build, rebase
/finishFinish current branch. Verifies tests, reviews for EC memory storage, presents merge options.
/finishUse when implementation is complete and you need to merge, create a PR, or clean up — guides branch integration with 4 structured options
/finishFinish development work — push+PR, squash into trunk, keep, or discard
git branch --show-currentgit statusgit log @{u}.. --oneline 2>/dev/nullgit branch -aComplete and merge the current feature/hotfix/release branch following Git Flow conventions.
Verify the current branch type:
Pre-merge checks:
Merge strategy:
git checkout develop && git merge --no-ff <branch-name>git checkout main && git merge --no-ff <branch-name>git checkout develop && git merge --no-ff <branch-name>git checkout main && git merge --no-ff <branch-name>git tag -a vX.Y.Z -m "Release version X.Y.Z"git checkout develop && git merge --no-ff <branch-name>Post-merge:
git branch -d <branch-name> && git push origin --delete <branch-name>Confirm completion with summary of what was merged
Important: Always use --no-ff (no fast-forward) to preserve branch history.