branch-finish
Complete branch workflow with squash, rebase, and cleanup
Works with
--- name: branch-finish description: Complete branch workflow with squash, rebase, and cleanup license: MIT --- # Branch Finish Workflow I'll help you complete your branch workflow with intelligent squashing, rebasing, and cleanup. Arguments: `$ARGUMENTS` - target branch (defaults to main/master) ## Branch Completion Philosophy Finish branches cleanly: - Smart commit squashing with meaningful messages - Intelligent rebase strategy selection - Local and remote branch cleanup - PR/MR status verification - Integration with `/commit` workflow ## Token Optimization **Expected range**: 2,000–3,000 tokens (initial), 500 tokens (fast-forward) **Caching**: Caches branch analysis in `.branch-finish-cache/<branch>/` with a 5-minute TTL. **Early exit**: Returns immediately for single-commit branches or fast-forward merges. **Patterns used**: Grep-before-Read, early exit, git diff scope default, caching
More Git Workflows skills
git-commit
github/awesome-copilot
Execute git commit with conventional commit message analysis, intelligent staging, and message generation. Use when user asks to commit changes, create a git commit, or mentions "/commit". Supports: (1) Auto-detecting type and scope from changes, (2) Generating conventional commit messages from diff, (3) Interactive commit with optional type/scope/description overrides, (4) Intelligent file staging for logical grouping
git-workflow-and-versioning
addyosmani/agent-skills
Structures git workflow practices. Use when making any code change. Use when committing, branching, resolving conflicts, or when you need to organize work across multiple parallel streams. Use when cutting a release, choosing a semantic version bump, tagging, or writing a changelog.
resolve-merge-conflicts
warpdotdev/common-skills
Resolve Git merge conflicts by extracting only unresolved paths, conflict hunks, and compact diffs instead of loading whole files into context. Use when a merge, rebase, cherry-pick, or stash pop stops on conflicts, when `git status` shows unmerged paths, or when files contain conflict markers.
