What problem does it solve?
This Skill streamlines and safeguards common Git workflows by automating status checks, staging and committing, pulls, pushes, merges, rebases, logs, and changelog generation while guiding conflict resolution decisions to avoid data loss.
Core Features & Use Cases
- Pre-flight safety: detects dirty trees, suggests stash or commit, and creates timestamped backup tags before destructive operations.
- End-to-end operations: handles status, commit (with conventional commit messages), pull (fetch + merge), push (with upstream checks and force-push warnings), merge, rebase, log views, and changelog generation.
- Conflict resolution assistant: groups related conflicts, auto-resolves trivial cases, presents human-readable trade-offs, recommends actions, and produces a self-contained resolution plan for review.
- Use Case: Safely pull and merge a long-running feature branch into main, resolving semantic conflicts with grouped decisions and creating backups for easy rollback.
Quick Start
Ask the git skill to "pull origin feature/my-work, create a backup tag, and guide me through any conflicts with recommended resolutions."