{"id":"1550c67e-f661-4fde-a639-4133498999b4","shortId":"MwPY9j","kind":"skill","title":"git-workflow","tagline":"Guided Git workflow assistant. Helps with branching strategies, writing conventional commits, opening pull requests, resolving merge conflicts, and keeping history clean. TRIGGER when the user writes /git-workflow or asks for help with Git, branches, commits, PRs, or merge confli","description":"# Git Workflow Skill\n\nYou are a Git workflow expert. Guide the user through best-practice Git operations step by step.\n\n## Detect context\n\nBefore doing anything, run:\n\n```bash\ngit status\ngit log --oneline -10\n```\n\nUse the output to understand:\n\n- Current branch\n- Uncommitted changes\n- Recent commit history\n\nThen ask the user what they want to do if it is not already clear from their message.\n\n## Branching\n\nWhen creating a new branch:\n\n1. Confirm the base branch (usually `main` or `develop`).\n2. Pull the latest changes: `git pull origin <base>`.\n3. Create a descriptive branch name following the pattern `<type>/<short-description>`:\n   - `feat/add-login-page`\n   - `fix/null-pointer-in-auth`\n   - `chore/update-dependencies`\n   - `docs/api-reference`\n4. Create and switch: `git checkout -b <branch-name>`.\n\n## Committing\n\nWrite commits that follow the **Conventional Commits** spec:\n\n```md\n<type>(<optional scope>): <short imperative summary>\n\n[optional body explaining *why*, not what]\n\n[optional footer: BREAKING CHANGE, closes #issue]\n```\n\nAllowed types: `feat`, `fix`, `docs`, `style`, `refactor`, `perf`, `test`, `chore`, `ci`, `build`, `revert`.\n\nRules:\n\n- Summary is ≤ 50 characters, lowercase, no trailing period.\n- Use the body for non-obvious reasoning.\n- Reference issues with `closes #<n>` or `refs #<n>`.\n\nWhen the user has staged changes, suggest a commit message based on the diff:\n\n```bash\ngit diff --cached\n```\n\n## Pull Requests\n\nBefore opening a PR:\n\n1. Rebase onto the latest base branch to keep history linear:\n\n   ```bash\n   git fetch origin\n   git rebase origin/main\n   ```\n\n2. Run tests and linters.\n3. Push the branch: `git push -u origin <branch-name>`.\n4. Draft a PR description using this template:\n\n```md\n## What & Why\n<!-- One paragraph explaining the change and its motivation. -->\n\n## How\n<!-- Key implementation decisions. -->\n\n## Testing\n<!-- How was this tested? -->\n\n## Checklist\n- [ ] Tests pass\n- [ ] Docs updated (if needed)\n- [ ] No unintended side effects\n```\n\n## Merge conflict resolution\n\nWhen conflicts are detected:\n\n1. List conflicting files: `git diff --name-only --diff-filter=U`.\n2. For each file, show the conflict markers and explain both sides.\n3. Suggest the correct resolution based on the intent of each change.\n4. After resolving, stage the file: `git add <file>`.\n5. Continue the rebase or merge: `git rebase --continue` / `git merge --continue`.\n\n## Keeping history clean\n\n| Situation | Command |\n| ----------- | ----------- |\n| Amend last commit message | `git commit --amend` |\n| Squash last N commits | `git rebase -i HEAD~N` |\n| Undo last commit (keep changes) | `git reset --soft HEAD~1` |\n| Drop a commit from history | `git rebase -i <parent-sha>` |\n| Remove a file from history | `git filter-repo --path <file> --invert-paths` (requires `pip install git-filter-repo`) |\n\nAlways warn before any history-rewriting command that has been pushed to a shared branch.\n\n## Output format\n\nAfter every operation, show:\n\n- The exact commands run\n- The output\n- What the next step is\n\nKeep explanations concise. If something could go wrong, warn proactively.","tags":["git","workflow","agent","skills","kambleakash0","agent-skills","ai-agents","ai-assistant","antigravity","automation","claude-code","code-review"],"capabilities":["skill","source-kambleakash0","skill-git-workflow","topic-agent-skills","topic-ai-agents","topic-ai-assistant","topic-antigravity","topic-automation","topic-claude-code","topic-code-review","topic-codex","topic-cusror","topic-developer-tools","topic-gemini-cli","topic-llm-tools"],"categories":["agent-skills"],"synonyms":[],"warnings":[],"endpointUrl":"https://skills.sh/kambleakash0/agent-skills/git-workflow","protocol":"skill","transport":"skills-sh","auth":{"type":"none","details":{"cli":"npx skills add kambleakash0/agent-skills","source_repo":"https://github.com/kambleakash0/agent-skills","install_from":"skills.sh"}},"qualityScore":"0.453","qualityRationale":"deterministic score 0.45 from registry signals: · indexed on github topic:agent-skills · 6 github stars · SKILL.md body (3,117 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-18T19:14:26.146Z","embedding":null,"createdAt":"2026-05-18T13:22:06.410Z","updatedAt":"2026-05-18T19:14:26.146Z","lastSeenAt":"2026-05-18T19:14:26.146Z","tsv":"'-10':76 '/git-workflow':30 '1':113,232,294 '2':122,250,307 '3':130,255,319 '4':143,263,331 '5':339 '50':188 'add':338 'allow':172 'alreadi':102 'alway':410 'amend':356,362 'anyth':68 'ask':32,90 'assist':7 'b':149 'base':116,218,237,324 'bash':70,222,243 'best':57 'best-practic':56 'bodi':161,196 'branch':10,37,83,107,112,117,134,238,258,425 'break':168 'build':183 'cach':225 'chang':85,126,169,213,330,376 'charact':189 'checklist':276 'checkout':148 'chore':181 'chore/update-dependencies':141 'ci':182 'clean':24,353 'clear':103 'close':170,205 'command':355,417,434 'commit':14,38,87,150,152,157,216,358,361,366,374,384 'concis':445 'confirm':114 'confli':42 'conflict':20,288,291,296,313 'context':65 'continu':340,347,350 'convent':13,156 'correct':322 'could':448 'creat':109,131,144 'current':82 'descript':133,267 'detect':64,293 'develop':121 'diff':221,224,299,304 'diff-filt':303 'doc':176,279 'docs/api-reference':142 'draft':264 'drop':382 'effect':286 'everi':429 'exact':433 'expert':51 'explain':162,316 'explan':444 'feat':174 'feat/add-login-page':139 'fetch':245 'file':297,310,336,392 'filter':305,397,408 'filter-repo':396 'fix':175 'fix/null-pointer-in-auth':140 'follow':136,154 'footer':167 'format':427 'git':2,5,36,43,49,59,71,73,127,147,223,244,247,259,298,337,345,348,360,367,377,387,395,407 'git-filter-repo':406 'git-workflow':1 'go':449 'guid':4,52 'head':370,380 'help':8,34 'histori':23,88,241,352,386,394,415 'history-rewrit':414 'instal':405 'intent':327 'invert':401 'invert-path':400 'issu':171,203 'keep':22,240,351,375,443 'last':357,364,373 'latest':125,236 'linear':242 'linter':254 'list':295 'log':74 'lowercas':190 'main':119 'marker':314 'md':159,271 'merg':19,41,287,344,349 'messag':106,217,359 'n':365 'name':135,301 'name-on':300 'need':282 'new':111 'next':440 'non':199 'non-obvi':198 'obvious':200 'onelin':75 'onto':234 'open':15,229 'oper':60,430 'option':160,166 'origin':129,246,262 'origin/main':249 'output':79,426,437 'pass':278 'path':399,402 'pattern':138 'perf':179 'period':193 'pip':404 'pr':231,266 'practic':58 'proactiv':452 'prs':39 'pull':16,123,128,226 'push':256,260,421 'reason':201 'rebas':233,248,342,346,368,388 'recent':86 'ref':207 'refactor':178 'refer':202 'remov':390 'repo':398,409 'request':17,227 'requir':403 'reset':378 'resolut':289,323 'resolv':18,333 'revert':184 'rewrit':416 'rule':185 'run':69,251,435 'share':424 'show':311,431 'side':285,318 'situat':354 'skill':45 'skill-git-workflow' 'soft':379 'someth':447 'source-kambleakash0' 'spec':158 'squash':363 'stage':212,334 'status':72 'step':61,63,441 'strategi':11 'style':177 'suggest':214,320 'summari':186 'switch':146 'templat':270 'test':180,252,275,277 'topic-agent-skills' 'topic-ai-agents' 'topic-ai-assistant' 'topic-antigravity' 'topic-automation' 'topic-claude-code' 'topic-code-review' 'topic-codex' 'topic-cusror' 'topic-developer-tools' 'topic-gemini-cli' 'topic-llm-tools' 'trail':192 'trigger':25 'type':173 'u':261,306 'uncommit':84 'understand':81 'undo':372 'unintend':284 'updat':280 'use':77,194,268 'user':28,54,92,210 'usual':118 'want':95 'warn':411,451 'workflow':3,6,44,50 'write':12,29,151 'wrong':450 '~1':381 '~n':371","prices":[{"id":"3701fe24-fe04-4842-a90c-993ac2f22809","listingId":"1550c67e-f661-4fde-a639-4133498999b4","amountUsd":"0","unit":"free","nativeCurrency":null,"nativeAmount":null,"chain":null,"payTo":null,"paymentMethod":"skill-free","isPrimary":true,"details":{"org":"kambleakash0","category":"agent-skills","install_from":"skills.sh"},"createdAt":"2026-05-18T13:22:06.410Z"}],"sources":[{"listingId":"1550c67e-f661-4fde-a639-4133498999b4","source":"github","sourceId":"kambleakash0/agent-skills/git-workflow","sourceUrl":"https://github.com/kambleakash0/agent-skills/tree/main/skills/git-workflow","isPrimary":false,"firstSeenAt":"2026-05-18T13:22:06.410Z","lastSeenAt":"2026-05-18T19:14:26.146Z"}],"details":{"listingId":"1550c67e-f661-4fde-a639-4133498999b4","quickStartSnippet":null,"exampleRequest":null,"exampleResponse":null,"schema":null,"openapiUrl":null,"agentsTxtUrl":null,"citations":[],"useCases":[],"bestFor":[],"notFor":[],"kindDetails":{"org":"kambleakash0","slug":"git-workflow","github":{"repo":"kambleakash0/agent-skills","stars":6,"topics":["agent-skills","ai-agents","ai-assistant","antigravity","automation","claude-code","code-review","codex","cusror","developer-tools","gemini-cli","llm-tools","mcp","prompt-engineering"],"license":"mit","html_url":"https://github.com/kambleakash0/agent-skills","pushed_at":"2026-05-02T07:18:13Z","description":"A curated collection of custom AgentSkills and token-saving MCP servers for extending the capabilities of AI coding assistants like Claude Code.","skill_md_sha":"19f9f9d1ed8729d3e84a25bca191af040b468bc5","skill_md_path":"skills/git-workflow/SKILL.md","default_branch":"main","skill_tree_url":"https://github.com/kambleakash0/agent-skills/tree/main/skills/git-workflow"},"layout":"multi","source":"github","category":"agent-skills","frontmatter":{"name":"git-workflow","description":"Guided Git workflow assistant. Helps with branching strategies, writing conventional commits, opening pull requests, resolving merge conflicts, and keeping history clean. TRIGGER when the user writes /git-workflow or asks for help with Git, branches, commits, PRs, or merge conflicts."},"skills_sh_url":"https://skills.sh/kambleakash0/agent-skills/git-workflow"},"updatedAt":"2026-05-18T19:14:26.146Z"}}