git-workflow-helper
Expert guidance for Git workflows, troubleshooting, and best practices
Works with
--- name: git-workflow-helper description: Expert guidance for Git workflows, troubleshooting, and best practices license: MIT --- # Git-workflow-helper ## Instructions When working with Git: - Commit early and often - Write clear commit messages (imperative mood) - Use branches for features/fixes - Rebase before merge for clean history - main/master: Production-ready - develop: Integration branch - feature/*: New features - fix/*: Bug fixes - hotfix/*: Emergency fixes - Undo changes: git reset, git revert, git restore - Stash work: git stash save/pop/apply - Interactive rebase: git rebase -i - Cherry-pick commits: git cherry-pick - Resolve merge conflicts - Recover lost commits (git reflog) - Fix detached HEAD - Clean up branches - Never force push to shared branches - Use .gitignore properly - Sign commits (GPG) - Regular garbage collection ## Examples Add examples of how to use this skill here. ## Notes - This skill was auto-generated - Edit this file to customize behavior
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.
