Skip to main content
skill CX Codex

w-git-repair — Claude Code skill: Git fixes and installation

The w-git-repair Claude Code skill diagnoses local Git problems and conflicts. It checks repository state before suggesting repair commands.

MIT 647 installs ★ 1 updated 2026-10-02

Install into Claude Code · Skills CLI (Vercel) All methods and platforms ↓
npx skills add blockmatic-icebox/basilic-skills --skill w-git-repair -a claude-code
Open on GitHub

What w-git-repair does

The skill handles merge conflicts, detached HEAD, and upstream divergence. It first checks git status, git branch -vv, and the relevant log, then summarizes the issue and suggests the smallest set of commands, explaining their effects.

Commands that can discard local changes require explicit confirmation. History-rewriting commands require a direct user request, and published history must not be changed without one. After an authorized command, the skill checks repository status and any remaining conflicts. It never force-pushes or bypasses hooks.

What it helps with

  • resolve a Git merge conflict
  • recover from detached HEAD
  • identify why a local branch diverges from upstream
  • choose repair commands without discarding local changes

Example prompts for the agent

  • Check the current branch and suggest safe commands to resolve this conflict.
  • Help me leave detached HEAD; inspect the repository state first.
  • Explain the upstream divergence and propose the smallest fix.

How to install w-git-repair

1Skills CLI (Vercel)

npx skills add blockmatic-icebox/basilic-skills --skill w-git-repair -a claude-code

2Manually: put the files in place

~/.claude/skills/w-git-repair/SKILL.md

Copy the whole skill folder; for one project use .claude/skills/w-git-repair/

Step by step, with commands for each platform: How to install skills in Claude Code: five ways

Questions about w-git-repair

How do I install w-git-repair in Claude Code?

Run npx skills add blockmatic-icebox/basilic-skills --skill w-git-repair -a claude-code. The skill file is at ~/.claude/skills/w-git-repair/SKILL.md.

What does w-git-repair do?

It inspects Git status, branches, and the relevant log, then suggests commands for conflicts, detached HEAD, and upstream divergence. After an authorized fix, it checks the status and remaining conflicts.

How does w-git-repair protect local changes?

It asks for explicit confirmation before commands that can discard local changes. History-rewriting commands need a direct request; force-pushing and bypassing hooks are prohibited.

Source text

SKILL.md · MIT
---
name: w-git-repair
description: Resolve common Git problems and conflicts with inspected commands.
disable-model-invocation: true
---

Help with conflicts, detached HEAD, upstream divergence, and similar local Git problems. Follow [git publish](references/git-publish.md). Do not rewrite published history unless the user asked.

1. Inspect `git status`, `git branch -vv`, and the relevant log. State the current problem in one sentence.
2. Propose the smallest safe commands. Explain what they change. Require explicit confirmation before commands that can discard local changes (`git reset --hard`, `git clean`, `git restore`). Require an explicit user request before history-rewriting commands (`git rebase`, `git commit --amend` of a published commit).
3. After an authorized command, re-inspect status and remaining conflicts. Never force-push or bypass hooks.

© blockmatic-icebox · MIT · blockmatic-icebox/basilic-skills

Similar skills

All skills for Git and GitHub →

From the same set45

The whole set →
w-debug-browser The w-debug-browser Claude Code skill reproduces and fixes authorized browser issues using runtime evidence. It inspects DOM, network, and console data, then replays the interaction after a fix. CX Codex +1 647installs w-debug The w-debug Claude Code skill traces failures through logs and reproduction steps. After an authorized fix, it reruns the original scenario and affected checks. CX Codex +1 647installs w-ship The w-ship Claude Code skill takes a requested change from implementation through pull request. It reads repository guidance, validates the work, commits it, and creates or updates a PR. CX Codex +1 647installs w-fix-push The w-fix-push Claude Code skill addresses reported issues, runs a matching check, then commits and pushes the changes. It starts from a request to fix specific problems. CX Codex +1 647installs w-comments The w-comments Claude Code skill handles reviewer comments on pull requests and applies requested fixes. It drafts a reply for each comment and only commits after /w-commit is invoked. CX Codex +1 647installs w-pr The w-pr Claude Code skill creates or updates a pull request for the intended branch. It publishes the branch, writes the PR description, and checks the result. CX Codex +1 647installs w-push w-push — a skill for Claude Code checks changes before pushing the intended branch. It runs when asked to publish the current task. CX Codex +1 647installs w-commit The w-commit Claude Code skill reviews task changes and creates a repository-style commit. It runs when a commit is requested. CX Codex +1 647installs

Project sponsors

Companies that keep this analytics open