What problem does it solve? Changing Git history or repository state is risky: force-pushes, resets, and blind conflict resolutions can destroy work or disrupt collaborators. This Skill guides safe Git operations by inspecting repository state first and choosing the least disruptive command for each task. ## Core Features & Use Cases - Safe History Operations: Guides rebase, cherry-pick, revert, bisect, worktree, and reflog usage with clear rules on when each is appropriate. - Conflict Resolution: Resolves merge conflicts by understanding both sides semantically instead of blindly choosing ours or theirs, then verifies with diffs and checks. - Recovery and Protection: Locates lost commits via reflog, creates safety references before destructive actions, and never force-pushes shared branches without authorization. - Use Case: You need to move a commit from a feature branch to main, resolve a merge conflict, and recover a commit lost after a bad reset—all without touching unrelated uncommitted changes. ## Quick Start Ask the assistant to cherry-pick a specific commit onto your current branch and resolve any conflicts while preserving your uncommitted changes.
