{"id":"16d600a8-4ea8-4855-a66b-ea058c983f1e","shortId":"REALRV","kind":"skill","title":"managing-git","tagline":"Manages Git workflows including branching, commits, and pull requests. Use when working with Git, creating commits, opening PRs, managing branches, resolving conflicts, or when asked about version control best practices.","description":"# Managing Git\n\n### When to Load\n\n- **Trigger**: Branching strategies, commit workflows, pull requests, merge conflicts, version control questions\n- **Skip**: Tasks that do not involve git operations\n\n## Feature Development Workflow\n\nCopy this checklist and track progress:\n\n```\nFeature Development Progress:\n- [ ] Step 1: Create feature branch from main\n- [ ] Step 2: Make changes with atomic commits\n- [ ] Step 3: Rebase on latest main\n- [ ] Step 4: Push and create PR\n- [ ] Step 5: Address review feedback\n- [ ] Step 6: Merge after approval\n```\n\n## Branching Strategies\n\n### GitHub Flow (Recommended for most projects)\n\n```\nmain ──●────●────●────●────●── (always deployable)\n        \\          /\nfeature  └──●──●──┘\n```\n\n- `main` is always deployable\n- Feature branches from main\n- PR + review + merge\n- Deploy after merge\n\n### Git Flow (For release-based projects)\n\n```\nmain     ──●─────────────●────── (releases only)\n            \\           /\nrelease      └────●────┘\n                 /\ndevelop  ──●──●────●──●──●──\n            \\     /\nfeature      └──●┘\n```\n\n## Commit Conventions\n\n### Conventional Commits Format\n\n```\n<type>(<scope>): <description>\n\n[optional body]\n\n[optional footer(s)]\n```\n\n### Types\n\n| Type       | Description                                         |\n| ---------- | --------------------------------------------------- |\n| `feat`     | New feature                                         |\n| `fix`      | Bug fix                                             |\n| `docs`     | Documentation only                                  |\n| `style`    | Formatting, no logic change                         |\n| `refactor` | Code change that neither fixes bug nor adds feature |\n| `perf`     | Performance improvement                             |\n| `test`     | Adding/updating tests                               |\n| `chore`    | Build process, dependencies                         |\n| `ci`       | CI configuration                                    |\n\n### Examples\n\n```bash\nfeat(auth): add OAuth2 login support\n\nImplements Google and GitHub OAuth providers.\nCloses #123\n\nBREAKING CHANGE: Session tokens now expire after 24h\n```\n\n```bash\nfix(api): handle null response from payment gateway\n\nPreviously caused 500 error when gateway returned null.\nNow returns appropriate error message to user.\n```\n\n## Branch Naming\n\n```\n<type>/<ticket-id>-<short-description>\n\n# Examples\nfeature/AUTH-123-oauth-login\nfix/BUG-456-null-pointer\nchore/TECH-789-upgrade-deps\n```\n\n## Pull Request Workflow\n\nCopy this checklist when creating PRs:\n\n```\nPR Checklist:\n- [ ] Code follows project conventions\n- [ ] Tests added/updated for changes\n- [ ] All tests pass locally\n- [ ] No merge conflicts with main\n- [ ] Documentation updated if needed\n- [ ] No security vulnerabilities introduced\n- [ ] PR description explains the \"why\"\n```\n\n### PR Template\n\n```markdown\n## Summary\n\n[Brief description of changes]\n\n## Changes\n\n- [Change 1]\n- [Change 2]\n\n## Testing\n\n- [ ] Unit tests added/updated\n- [ ] Manual testing performed\n- [ ] E2E tests pass\n\n## Screenshots (if UI changes)\n\n[Before/After screenshots]\n```\n\n### PR Size Guidelines\n\n| Size | Lines Changed | Review Guidance   |\n| ---- | ------------- | ----------------- |\n| XS   | < 50          | Quick review      |\n| S    | 50-200        | Standard review   |\n| M    | 200-500       | Thorough review   |\n| L    | 500+          | Split if possible |\n\n## Common Git Commands\n\n### Daily Workflow\n\n```bash\n# Start new feature\ngit checkout main\ngit pull\ngit checkout -b feature/TICKET-123-description\n\n# Commit changes\ngit add -p  # Stage interactively\ngit commit -m \"feat: description\"\n\n# Keep up with main\ngit fetch origin main\ngit rebase origin/main\n\n# Push and create PR\ngit push -u origin HEAD\n```\n\n### Fixing Mistakes\n\n```bash\n# Amend last commit (before push)\ngit commit --amend\n\n# Undo last commit (keep changes)\ngit reset --soft HEAD~1\n\n# Undo last commit (discard changes)\ngit reset --hard HEAD~1\n\n# Revert a pushed commit\ngit revert <commit-hash>\n\n# Interactive rebase to clean up\ngit rebase -i HEAD~3\n```\n\n### Advanced Operations\n\n```bash\n# Cherry-pick specific commit\ngit cherry-pick <commit-hash>\n\n# Find which commit broke something\ngit bisect start\ngit bisect bad HEAD\ngit bisect good <known-good-commit>\n\n# Stash with message\ngit stash push -m \"WIP: feature description\"\ngit stash list\ngit stash pop\n```\n\n## Commit Validation\n\nBefore pushing, validate commits:\n\n```\nCommit Validation:\n- [ ] Each commit has a clear, descriptive message\n- [ ] Commit type matches the change (feat, fix, etc.)\n- [ ] No WIP or temporary commits\n- [ ] No secrets or credentials committed\n- [ ] Changes are atomic (one logical change per commit)\n```\n\nIf validation fails, use `git rebase -i` to clean up commit history before pushing.","tags":["managing","git","claude","workflow","cloudai-x","agent-skills","ai-agents","claude-code","codex","cursor","skills"],"capabilities":["skill","source-cloudai-x","skill-managing-git","topic-agent-skills","topic-ai-agents","topic-claude-code","topic-codex","topic-cursor","topic-skills","topic-workflow"],"categories":["claude-workflow-v2"],"synonyms":[],"warnings":[],"endpointUrl":"https://skills.sh/CloudAI-X/claude-workflow-v2/managing-git","protocol":"skill","transport":"skills-sh","auth":{"type":"none","details":{"cli":"npx skills add CloudAI-X/claude-workflow-v2","source_repo":"https://github.com/CloudAI-X/claude-workflow-v2","install_from":"skills.sh"}},"qualityScore":"0.700","qualityRationale":"deterministic score 0.70 from registry signals: · indexed on github topic:agent-skills · 1352 github stars · SKILL.md body (4,772 chars)","verified":false,"liveness":"unknown","lastLivenessCheck":null,"agentReviews":{"count":0,"score_avg":null,"cost_usd_avg":null,"success_rate":null,"latency_p50_ms":null,"narrative_summary":null,"summary_updated_at":null},"enrichmentModel":"deterministic:skill-github:v1","enrichmentVersion":1,"enrichedAt":"2026-05-03T00:52:56.013Z","embedding":null,"createdAt":"2026-04-18T21:54:57.251Z","updatedAt":"2026-05-03T00:52:56.013Z","lastSeenAt":"2026-05-03T00:52:56.013Z","tsv":"'-200':334 '-500':339 '1':72,301 '123':211 '2':79,303 '200':338 '24h':219 '3':86 '4':92 '5':98 '50':329,333 '500':231,343 '6':103 'add':181,200,368 'added/updated':266,307 'adding/updating':187 'address':99 'advanc':444 'alway':116,121 'amend':400,407 'api':222 'appropri':239 'approv':106 'ask':28 'atom':83,522 'auth':199 'b':363 'bad':466 'base':138 'bash':197,220,352,399,446 'before/after':318 'best':32 'bisect':462,465,469 'bodi':152 'branch':8,23,40,75,107,124,244 'break':212 'brief':295 'broke':459 'bug':163,179 'build':190 'caus':230 'chang':81,172,175,213,268,298,299,300,302,317,325,366,412,422,506,520,525 'checklist':64,255,260 'checkout':357,362 'cherri':448,454 'cherry-pick':447,453 'chore':189 'chore/tech-789-upgrade-deps':249 'ci':193,194 'clean':437,536 'clear':499 'close':210 'code':174,261 'command':349 'commit':9,19,42,84,146,149,365,373,402,406,410,420,431,451,458,487,492,493,496,502,514,519,527,538 'common':347 'configur':195 'conflict':25,47,275 'control':31,49 'convent':147,148,264 'copi':62,253 'creat':18,73,95,257,390 'credenti':518 'daili':350 'depend':192 'deploy':117,122,130 'descript':158,287,296,376,480,500 'develop':60,69,144 'discard':421 'doc':165 'document':166,278 'e2e':311 'error':232,240 'etc':509 'exampl':196,246 'expir':217 'explain':288 'fail':530 'feat':159,198,375,507 'featur':59,68,74,118,123,145,161,182,355,479 'feature/auth-123-oauth-login':247 'feature/ticket-123-description':364 'feedback':101 'fetch':382 'find':456 'fix':162,164,178,221,397,508 'fix/bug-456-null-pointer':248 'flow':110,134 'follow':262 'footer':154 'format':150,169 'gateway':228,234 'git':3,5,17,35,57,133,348,356,359,361,367,372,381,385,392,405,413,423,432,439,452,461,464,468,474,481,484,532 'github':109,207 'good':470 'googl':205 'guidanc':327 'guidelin':322 'handl':223 'hard':425 'head':396,416,426,442,467 'histori':539 'implement':204 'improv':185 'includ':7 'interact':371,434 'introduc':285 'involv':56 'keep':377,411 'l':342 'last':401,409,419 'latest':89 'line':324 'list':483 'load':38 'local':272 'logic':171,524 'login':202 'm':337,374,477 'main':77,90,115,119,126,140,277,358,380,384 'make':80 'manag':2,4,22,34 'managing-git':1 'manual':308 'markdown':293 'match':504 'merg':46,104,129,132,274 'messag':241,473,501 'mistak':398 'name':245 'need':281 'neither':177 'new':160,354 'null':224,236 'oauth':208 'oauth2':201 'one':523 'open':20 'oper':58,445 'option':151,153 'origin':383,395 'origin/main':387 'p':369 'pass':271,313 'payment':227 'per':526 'perf':183 'perform':184,310 'pick':449,455 'pop':486 'possibl':346 'pr':96,127,259,286,291,320,391 'practic':33 'previous':229 'process':191 'progress':67,70 'project':114,139,263 'provid':209 'prs':21,258 'pull':11,44,250,360 'push':93,388,393,404,430,476,490,541 'question':50 'quick':330 'rebas':87,386,435,440,533 'recommend':111 'refactor':173 'releas':137,141,143 'release-bas':136 'request':12,45,251 'reset':414,424 'resolv':24 'respons':225 'return':235,238 'revert':428,433 'review':100,128,326,331,336,341 'screenshot':314,319 'secret':516 'secur':283 'session':214 'size':321,323 'skill' 'skill-managing-git' 'skip':51 'soft':415 'someth':460 'source-cloudai-x' 'specif':450 'split':344 'stage':370 'standard':335 'start':353,463 'stash':471,475,482,485 'step':71,78,85,91,97,102 'strategi':41,108 'style':168 'summari':294 'support':203 'task':52 'templat':292 'temporari':513 'test':186,188,265,270,304,306,309,312 'thorough':340 'token':215 'topic-agent-skills' 'topic-ai-agents' 'topic-claude-code' 'topic-codex' 'topic-cursor' 'topic-skills' 'topic-workflow' 'track':66 'trigger':39 'type':156,157,503 'u':394 'ui':316 'undo':408,418 'unit':305 'updat':279 'use':13,531 'user':243 'valid':488,491,494,529 'version':30,48 'vulner':284 'wip':478,511 'work':15 'workflow':6,43,61,252,351 'xs':328 '~1':417,427 '~3':443","prices":[{"id":"2ef9caf8-b01d-4f31-939c-6aee4c142066","listingId":"16d600a8-4ea8-4855-a66b-ea058c983f1e","amountUsd":"0","unit":"free","nativeCurrency":null,"nativeAmount":null,"chain":null,"payTo":null,"paymentMethod":"skill-free","isPrimary":true,"details":{"org":"CloudAI-X","category":"claude-workflow-v2","install_from":"skills.sh"},"createdAt":"2026-04-18T21:54:57.251Z"}],"sources":[{"listingId":"16d600a8-4ea8-4855-a66b-ea058c983f1e","source":"github","sourceId":"CloudAI-X/claude-workflow-v2/managing-git","sourceUrl":"https://github.com/CloudAI-X/claude-workflow-v2/tree/main/skills/managing-git","isPrimary":false,"firstSeenAt":"2026-04-18T21:54:57.251Z","lastSeenAt":"2026-05-03T00:52:56.013Z"}],"details":{"listingId":"16d600a8-4ea8-4855-a66b-ea058c983f1e","quickStartSnippet":null,"exampleRequest":null,"exampleResponse":null,"schema":null,"openapiUrl":null,"agentsTxtUrl":null,"citations":[],"useCases":[],"bestFor":[],"notFor":[],"kindDetails":{"org":"CloudAI-X","slug":"managing-git","github":{"repo":"CloudAI-X/claude-workflow-v2","stars":1352,"topics":["agent-skills","ai","ai-agents","claude-code","codex","cursor","skills","workflow"],"license":"mit","html_url":"https://github.com/CloudAI-X/claude-workflow-v2","pushed_at":"2026-02-14T18:09:29Z","description":"Universal Claude Code workflow plugin with agents, skills, hooks, and commands","skill_md_sha":"dc3e16951d0cac1ffa7f4cf6a526eae3211f4021","skill_md_path":"skills/managing-git/SKILL.md","default_branch":"main","skill_tree_url":"https://github.com/CloudAI-X/claude-workflow-v2/tree/main/skills/managing-git"},"layout":"multi","source":"github","category":"claude-workflow-v2","frontmatter":{"name":"managing-git","description":"Manages Git workflows including branching, commits, and pull requests. Use when working with Git, creating commits, opening PRs, managing branches, resolving conflicts, or when asked about version control best practices."},"skills_sh_url":"https://skills.sh/CloudAI-X/claude-workflow-v2/managing-git"},"updatedAt":"2026-05-03T00:52:56.013Z"}}