git-operations

Retry git pushes, enforce safe pulls, and detect merge conflicts.

19|3|Updated Jan 13, 2026
One-click install
npx skills add https://github.com/changoo89/claude-pilot --skill git-operations-changoo89
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: git-operations
Source: https://github.com/changoo89/claude-pilot/tree/main/.claude/skills/git-operations
Command: npx skills add https://github.com/changoo89/claude-pilot --skill git-operations-changoo89

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This skill addresses unreliable Git workflows by providing retry logic for pushes, safe pulls, and conflict-aware merges, reducing manual retries and accidental data loss.

Core Features & Use Cases

  • Push with retry and error classification to handle transient network issues and non-fast-forward errors.
  • Safe pull operations that enforce clean working trees and fast-forward only merges.
  • Safe merge helper with conflict detection and guidance for resolution.
  • Comprehensive error handling and recovery patterns to guide retries, retry backoff, and fallback actions.

Quick Start

Push with retry, pull safely, and merge with conflict checks using the git-operations skill.

Frequently Asked Questions about git-operations

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

FAQPage Schema
How do I retry a git push automatically when network connections drop?

Retry git push operations automatically by implementing push logic with exponential backoff and error classification, which handles transient network issues and non-fast-forward errors without manual intervention.

What is the safest way to pull from a remote repository and avoid accidental overwrites?

Safe pull operations enforce a clean working tree and execute fast-forward only merges, preventing accidental data loss and avoiding unintended merge commits during remote repository synchronization.

How do I detect merge conflicts and get resolution guidance during git workflows?

Detect merge conflicts using a safe merge helper that identifies divergent branches and provides clear error guidance, helping developers manage feature branch collaboration and resolve conflicts systematically.

Why does my git push fail with a non-fast-forward error during collaboration workflows?

Git push fails with non-fast-forward errors when remote branches contain uncommitted changes, requiring error classification logic to distinguish this from transient network failures and trigger safe pull reconciliation.

Can I automate git operations across feature branches without losing uncommitted data?

Automate git operations safely across feature branches by enforcing clean working tree checks before pulls and using merge safety checks, ensuring uncommitted local data is preserved during remote synchronization.