git-revert-safety

What problem does it solve?

This Skill solves the high-risk problem of failed git reverts that cause version metadata regressions, broken release artifacts, and contaminated main branches when undoing commits, merges, or recovering from accidental bad code pushes.

Core Features & Use Cases

• Collateral Damage Assessment: Identifies all files touched by reverted commits that are at risk of corruption, including version manifests, package.json, CHANGELOG, and lockfiles.
• Revert Strategy Decision Matrix: Guides selection between git revert and cherry-pick based on commit type (single, multi, merge, squash, octopus) and presence of release artifacts between commits.
• Post-Revert Verification: Provides step-by-step checks to confirm version metadata, dependency lockfiles, and CI status are correct after a revert operation.
• Branch Contamination Recovery: Outlines a clean-slate cherry-pick workflow to fully recover from wrong code merges without leaving behind corrupted release or dependency data.
• Use Case: If a team accidentally merges a broken feature to main after a release-please run, this Skill prevents version number corruption by guiding you to create a fresh branch and cherry-pick only valid fix commits instead of attempting risky incremental cleanup.

Quick Start

Use the git-revert-safety skill to safely revert the last merge commit to main without corrupting version metadata or breaking CI.