Finish Branch

Complete the current git-flow branch.

Usage

/gitmastery:finish        # Auto-detect branch type
/gitmastery:finish --tag  # For release/hotfix with tag

Workflow

1. Detect Context

git branch --show-current
git status --short

2. Execute Based on Type

Feature/Bugfix:

git flow finish  # Merges to develop, deletes branch

Release/Hotfix:

SKIP=no-commit-to-branch,conventional-commit git flow finish --tag -m "v<version> - Release notes"

Note: The SKIP env var bypasses pre-commit hooks that would reject the merge commit. This is safe because:

• The merge is mechanical (no new code changes)
• All code was already validated when committed to the release branch
• The no-commit-to-branch hook blocks commits to main/develop
• The conventional-commit hook may reject merge commit messages

3. Push Changes

git push origin develop
git push origin main --tags  # For release/hotfix

Branch Actions

Pre-finish Checklist

Present via AskUserQuestion:

• All tests pass
• Changelog updated
• No uncommitted changes
• Ready to merge

Conflict Resolution

If conflicts occur:

1. Resolve manually
2. git add <resolved-files>
3. git flow finish (retry)