Agent skill · writing content · aiskillstore
git-workflow
Manage Git workflows including commits, branches, merges, and collaboration. Use when working with Git repositories, creating commits, managing branches, or resolving conflicts.
Why this skill is useful
Codifies best practices for Git workflows, including branch naming conventions and commit message formats that the AI could infer but now doesn't have to guess.
What it needs
About 6k tokens when loaded. Last updated 2026-08-07. 405 stars on the source repository.
What this skill does
Git Workflow When to use this skill Creating meaningful commit messages Managing branches Merging code Resolving conflicts Collaborating with team Git best practices Instructions Step 1: Branch management Create feature branch: Naming conventions: feature/description: New features bugfix/description: Bug fixes hotfix/description: Urgent fixes refactor/description: Code refactoring docs/description: Documentation updates Step 2: Making changes Stage changes: Check status: Step 3: Committing Write good commit messages: Commit types: feat: New feature fix: Bug fix docs: Documentation style: Formatting, no code change refactor: Code refactoring test: Adding tests chore: Maintenance Example: Step 4: Pushing changes Step 5: Pulling and updating Step 6: Merging Merge feature branch: Rebase instead of merge: Step 7: Resolving conflicts When conflicts occur: Step 8: Cleaning up Advanced workflows Interactive rebase Stashing changes Cherry-picking Bisect (finding bugs) Examples Example 1: Feature development workflow Example 2: Hotfix workflow Example 3: Collaborative workflow Best practices 1. Commit often: Small, focused commits 2. Meaningful messages: Explain what and why 3. Pull before push: Stay updated 4. Review before commit: Check what you're committing 5. Use branches: Never commit directly to main 6. Keep history clean: Rebase feature branches 7. Test before push: Run tests locally 8. Write descriptive branch names: Easy to understand 9. Delete merged branches: Keep repository clean 10. Use .gitignore: Don't commit generated files Common patterns Undo last commit (keep changes) Undo last commit (discard changes) Amend last commit View history Find commits Troubleshooting Accidentally committed to wrong branch Need to undo a merge Recover deleted branch Sync fork with upstream Git configuration User setup Aliases Editor References Pro Git Book Git Cheat Sheet Conventional Commits Git Flow GitHub Flow
How to use it
Reference it in AdaL, Claude Code, Cursor or any coding agent — nothing to install:
@skills aiskillstore/git-workflow--e5e6a9