branching-strategy-weapon
Branching strategy advisor for Git-based teams. Owns model selection (trunk-based development, GitHub Flow, GitFlow), release and hotfix branch patterns, the merge-vs-rebase argument, the long-lived-branch trap, and the feature-flag vs feature-branch decision. Use when the user says "which branching model should we use", "we have too many merge conflicts", "our release process is broken", "GitFlow or trunk-based?", "merge or rebase?", "should I use a feature flag or a branch?", "set up GitHub Merge Queue", or when `branching-strategy-guardian` is invoked. Do NOT use for Git mechanics (interactive rebase, conflict resolution, history rewriting — that is `git-guardian`), branch protection ruleset configuration (that is `github-repo-health-guardian`), or CI/CD pipeline topology (that is `devops-guardian`).
Works with
This skill's source license couldn't be confirmed as safe to mirror here, so it isn't inlined. View the full skill directly on its source repository.
View on GitHubMore 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.
