mcpField
W
w-git-repair

w-git-repair

github.com/blockmaticDevelopment1647 installsUpdated 4w ago
Repository

About w-git-repair

w-git-repair is a Git troubleshooting skill for handling local repository problems such as conflicts, detached HEAD, and upstream divergence. It favors minimal safe changes, confirmation before destructive actions, and rechecking repository state afterward.

Key features

  1. 01Inspect status, branches, and logs
  2. 02Propose minimal safe commands
  3. 03Require consent for destructive actions
  4. 04Recheck status and conflicts
  5. 05Avoid force-push and hook bypasses

Use cases

  1. 01Resolve local merge conflicts
  2. 02Recover from detached HEAD
  3. 03Address upstream divergence

Install

Copy the command and run it in a terminal.

$npx skills add https://github.com/blockmatic/basilic-skills --skill w-git-repair

After installing, type/w-git-repairin Claude Code to confirm it loaded.

Bundled filesreferences/git-publish.md

Details

From the project README

Help with conflicts, detached HEAD, upstream divergence, and similar local Git problems. Follow git publish. 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.

Comments

Markdown supported