git

Coordinate git operations with automated conflict resolution and safety checks.

9|9|Updated Mar 24, 2026
One-click install
npx skills add https://github.com/nullmastermind/viber-router --skill git-nullmastermind
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: git
Source: https://github.com/nullmastermind/viber-router/tree/main/.claude/skills/git
Command: npx skills add https://github.com/nullmastermind/viber-router --skill git-nullmastermind

SYSTEM DOCUMENTATION & REQUIREMENTS

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."

Frequently Asked Questions about git

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I safely resolve git merge conflicts without losing changes?

Git rebase conflict resolution is managed by processing commits individually, recommending actions per-commit, and creating timestamped backup tags before destructive operations. This per-commit workflow minimizes data loss during complex history rewrites.

What's the best way to generate a changelog from conventional commit messages?

Changelog generation extracts data from conventional commit messages across local and remote branches to produce a structured history. This automates release documentation by parsing standardized commit formats directly from your git log queries.

How do I perform a pre-flight check before a destructive git push or merge?

Git pre-flight safety checks detect dirty trees, suggest stashing or committing uncommitted changes, and create timestamped backup tags before executing destructive operations. These checks require user-confirmed actions to proceed with force-pushes or complex merges.

Can I automate git pull and push operations across upstream branches?

Git pull and push operations are automated across upstream branches with built-in fetch, merge, and force-push warnings. The workflow inspects local and remote branch status, verifies upstream checks, and safeguards synchronization to prevent accidental overwrites.

Why does git rebase halt on semantic conflicts and how do I fix them?

Git rebase halts on semantic conflicts when overlapping changes cannot be auto-merged, requiring a guided resolution workflow. The conflict resolution assistant groups related issues, recommends actions, and produces a plan to safely resume the rebase.