Skills
.Work. You
Rest

git-state-safety

Community

Inspect refs safely during fragile Git states.

Software Engineering#git#merge conflicts#conflict resolution#cherry-pick#rebase workflow#index safety#ref inspection
Authorjcdendrite
Version1.0.0
Installs0

System Documentation

What problem does it solve?

Prevents silent Git index corruption when you inspect another ref during a merge, rebase, or cherry-pick with unresolved conflicts.

Core Features & Use Cases

  • Read-only cross-ref inspection: Uses safe commands (e.g., show, cat-file, log, diff, blame, ls-tree) to compare another ref’s content without mutating the index.
  • Conflict-stage awareness: Explains stage 1/2/3 so you can understand and safely resolve per-path conflicts using --ours or --theirs.
  • Safety rules and recovery recipes: Identifies unsafe mutations (like git checkout <ref> -- <path> or git add during conflicts) and provides recovery steps using abort or reset/repair commits depending on push status.

Quick Start

Ask the AI to help you inspect a file from origin/main while you are in the middle of a merge with unresolved conflicts, using only read-only commands and avoiding any index-overwriting operations.

Dependency Matrix

Required Modules

None required

Components

Standard package

💻 Claude Code Installation

Recommended: Let Claude install automatically. Simply copy and paste the text below to Claude Code.

Please help me install this Skill:
Name: git-state-safety
Download link: https://github.com/jcdendrite/claude-config/archive/main.zip#git-state-safety

Please download this .zip file, extract it, and install it in the .claude/skills/ directory.
View Source Repository

Agent Skills Search Helper

Install a tiny helper to your Agent, search and equip skill from 471,000+ vetted skills library on demand.