Agent skill · affaan-m
git-workflow
Git workflow patterns including branching strategies, commit conventions, keeping history clean and readable, tidying local commits before merging, merge vs rebase, conflict resolution, and collaborative development best practices for teams of all sizes. Use when choosing a branching strategy, writing commit conventions, cleaning up history before a pull request, deciding merge versus rebase, or resolving conflicts.
What it needs
About 10k tokens when loaded.
What this skill does
Git Workflow Patterns Best practices for Git version control, branching strategies, and collaborative development. When to Activate Setting up Git workflow for a new project Deciding on branching strategy (GitFlow, trunk-based, GitHub flow) Writing commit messages and PR descriptions Resolving merge conflicts Managing releases and version tags Onboarding new team members to Git practices Branching Strategies GitHub Flow (Simple, Recommended for Most) Best for continuous deployment and small-to-medium teams. Rules: main is always deployable Create feature branches from main Open Pull Request when ready for review After approval and CI passes, merge to main Deploy immediately after merge Trunk-Based Development (High-Velocity Teams) Best for teams with strong CI/CD and feature flags. Rules: Everyone commits to main or very short-lived branches Feature flags hide incomplete work CI must pass before merge Deploy multiple times per day GitFlow (Complex, Release-Cycle Driven) Best for scheduled releases and enterprise projects. Rules: main contains production-ready code only develop is the integration branch Feature branches from develop, merge back to develop Release branches from develop, merge to main and develop Hotfix branches from main, merge to both main and develop When to Use Which Strategy Team Size Release Cadence Best For ---------- ----------- ----------------- ---------- GitHub Flow Any Continuous SaaS, web apps, startups Trunk-Based 5+ experienced Multiple/day High-velocity teams, feature flags GitFlow 10+ Scheduled Enterprise, regulated industries Commit Messages Conventional Commits Format Types Type Use For Example ------ --------- --------- feat New feature feat(auth): add OAuth2 login fix Bug fix fix(api): handle null response in user endpoint docs Documentation docs(readme): update installation instructions style Formatting, no code change style: fix indentation in login component refactor Code refactoring refactor(db): extract connection pool to modu …
How to use it
Reference it in AdaL, Claude Code, Cursor or any coding agent — nothing to install:
@skills affaan-m/git-workflow--6c80a0