w-git-repair
Resolve common Git problems and conflicts with inspected commands.
Install
npx skills add https://github.com/blockmatic/basilic-skills --skill w-git-repairSKILL.md
Help with conflicts, detached HEAD, upstream divergence, and similar local Git problems. Follow git publish. Do not rewrite published history unless the user asked.
- Inspect
git status,git branch -vv, and the relevant log. State the current problem in one sentence. - 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 --amendof a published commit). - After an authorized command, re-inspect status and remaining conflicts. Never force-push or bypass hooks.
Related skills
setup-matt-pocock-skillsmattpocock905KConfigure this repo for the engineering skills: set up its issue tracker, triage label vocabulary, and domain doc layout. Run once before first use of the other engineering skills.hyperframes-cliheygen-com714KUse the HyperFrames CLI development loop: init, add, catalog, capture, lint, check, snapshot, compare, grade-compare, preview, play, present, beats, keyframes, single or batch render, publish, cloud, cloudrun, feedback, lambda, doctor, browser, info, upgrade, skills, compositions, timeline, history, docs, benchmark, telemetry, transcribe, auth, tts, and remove-background. Also use when diagnosing build or render failures. validate, inspect, and layout are deprecated aliases; use check. Covers loimplementmattpocock627KImplement a piece of work based on a spec or set of tickets.ask-mattmattpocock626KAsk which skill or flow fits your situation. A router over the skills in this repo.