fix-git-issues

fix-git-issues is a skill for Claude Code from blockmatic/basilic. It costs 33 tokens per session (247 once invoked), scanned A, original, MIT.

A guided helper for resolving common Git problems and merge conflicts with commands and explanations.

In plain words
What is it for?
Use it to diagnose and resolve everyday Git issues step by step.
Why use it?
It helps when Git reports errors or conflicts and you are unsure which command to run next.

Skill for Claude Code

Written for Claude Code: disable-model-invocation in frontmatter. Also seen: installed under .agents/ (shared by several agents).

Good fit Use it to diagnose and resolve everyday Git issues step by step.

Compare 6 skills from other repositories ↓
Install with agentmods
npx agentmods add skills/blockmatic/basilic/fix-git-issues
Install

Getting it into your agent

One page per mod, every tool's command on it. A separate URL per tool would split the same page into five that compete with each other.

Any agent
npx skills add blockmatic/basilic --skill fix-git-issues
Clone the repo
git clone --depth 1 https://github.com/blockmatic/basilic

Made for: Claude Code.

Wrote this? Show the measurements

A badge with what this costs and how it scanned, read live from this page, so it follows the numbers instead of freezing them. Markdown for a README, HTML for a documentation site or a project page.

agentmods badge for fix-git-issues

README.md
[![agentmods](https://agentmods.dev/badge/skills/blockmatic/basilic/fix-git-issues.svg)](https://agentmods.dev/skills/blockmatic/basilic/fix-git-issues)
Your own site
<a href="https://agentmods.dev/skills/blockmatic/basilic/fix-git-issues"><img src="https://agentmods.dev/badge/skills/blockmatic/basilic/fix-git-issues.svg" alt="Measured on agentmods" height="20"></a>
Per session 33 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 247 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. A grade says what 26 rules found in the file — not that it is safe. Third-party audits
  • NVIDIA SkillSpector pass 7 Sept 2026
How audits are shown
Origin original No closer match found in the catalogue.
Token cost

What it costs to keep this loaded

Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.

ModelPer sessionOnce invoked
Fable 5.1 $0.00033 $0.00247
Opus 5 $0.00016 $0.00123
Sonnet 5 $0.00007 $0.00049
Haiku 4.5 $0.00003 $0.00025

Measured yesterday against content hash 10ff86d284da, method: parsed. Prices are Anthropic first-party input rates as of 2026-09-08, from the pricing page.

Security

Grade A, and why

fix-git-issues scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured yesterday.

A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.

Nothing flagged

None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.

.agents/skills/workflow/fix-git-issues/SKILL.md · 21 lines

What it actually says

Purpose

Help resolve common Git problems and conflicts with step-by-step commands and explanations. Use global git user for any commits—never cursor/system identity. Never use --trailer for Co-authored-by or similar.

Steps

  1. Merge Conflicts: Analyze conflicting changes/context, provide resolution strategies, suggest best approach to preserve important changes, generate resolved code maintaining functionality
  2. Branch Management: Help with branch cleanup/organization, suggest rebasing vs merging strategies, assist with cherry-picking, guide through complex branch operations
  3. Commit History: Help with commit message improvements, assist with squashing/organizing commits, guide through interactive rebase, fix commit authorship/metadata
  4. Repository Issues: Help recover from detached HEAD state, assist with undoing commits/changes, guide through stash management, resolve submodule/remote issues

Completion

Read completion evidence before reporting completion.

Changes

What this file has done since we first saw it

Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.

  1. yesterday Changed · +7 lines 10ff86d284da
  2. 4d ago First seen · 14 lines · 33 tokens per session scan A 4d2806aa47a2

Subscribe to this mod's changes

fix-git-issues is a skill published in the GitHub repository blockmatic/basilic (89 stars, last pushed yesterday), licensed MIT. It adds 33 tokens to every session and 247 once invoked, about $0.0002 per session on Opus 5. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-09-03.

Related

Other skills, from other repositories

prowler-commit

Creates professional git commits following conventional-commits format. Trigger: When creating commits, after completing code changes, when user asks to commit.

prowler-cloud/prowler · 33 tokens

gh-auth-isolation

Safely manage multiple GitHub identities (EMU + personal) in agent workflows.

github/gh-aw · 20 tokens

comet-github

A routing guide for Comet-related GitHub work. It directs requests about pull requests, issues, CI failures, ideas, and fixes to the appropriate review or implementation process.

rpamis/comet · 72 tokens

github-skill

Work with GitHub via the gh CLI — clone repositories, create/list/merge pull requests, create/list issues, and run any other gh command (API calls, workflow runs, releases, repo administration). List operations return parsed JSON.

zeenie-ai/OpenCompany · 51 tokens

re0-merge

Review and land an external contribution the way this suite does: gate it against the thesis, land it with the author's credit intact, complete a new skill rather than merging it raw, then approve, credit, and explain before closing. Use when reviewing a pull request, as any collaborator or maintainer, not only the…

LilMGenius/paperthin · 70 tokens

codex-autoresearch

Run autonomous, measurable experiments in a Git repository: change one hypothesis, verify a numeric metric, keep improvements, and revert failures. Use when the user wants Codex to keep iterating toward a numeric target in the foreground or as a detached background run. Do not use for ordinary one-shot coding…

leo-lilinxiao/codex-autoresearch · 80 tokens