git-operations

Perform Git branch, commit, and remote operations with automated error handling.

Updated Sep 26, 2025
One-click install
npx skills add https://github.com/asunaro276/go-api-server-sample --skill git-operations
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: git-operations
Source: https://github.com/asunaro276/go-api-server-sample/tree/main/clean-architecture/.claude/skills/git-operations
Command: npx skills add https://github.com/asunaro276/go-api-server-sample --skill git-operations

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

This Skill provides comprehensive guidance for Git operations, helping developers navigate complex version control tasks, resolve conflicts, and adhere to best practices. It reduces the risk of errors, streamlines collaboration, and ensures a clean, maintainable repository history.

Core Features & Cases:

  • Comprehensive Git Guidance: Covers everything from basic commits and pushes to advanced branching, merging, rebasing, and stashing.
  • Best Practices Enforcement: Provides clear guidelines for commit messages, branching naming conventions, and Git safety protocols to maintain repository integrity.
  • Error Handling & Troubleshooting: Offers strategies for handling network errors, resolving merge conflicts, and recovering from incorrect commits, minimizing downtime and data loss.
  • Use Case: A developer needs to perform a complex rebase to clean up their feature branch before merging, or they encounter a tricky merge conflict. This skill provides step-by-step instructions and best practices, ensuring the operation is performed correctly and safely, saving time and preventing repository issues.

Quick Start

Basic Git workflow

git add <file> git commit -m "commit message" git push -u origin <branch-name>

Frequently Asked Questions about git-operations

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

FAQPage Schema
How do I safely push code to a remote repository without losing work?

Push safely by using `git push -u origin <branch-name>` to set upstream tracking and verify your branch exists remotely. This Skill covers push workflows with error handling and safety constraints to prevent overwriting remote changes or pushing to the wrong branch.

What's the best way to handle merge conflicts when pulling changes?

Merge conflicts occur when changes overlap; resolve them by editing conflicted files, staging resolved versions with `git add`, then committing. This Skill provides step-by-step strategies for conflict resolution, rebase workflows, and automated error handling to streamline the process.

How do I clean up my feature branch before merging using rebase?

Rebase rewrites commit history to apply your changes on top of the target branch, creating a linear history. This Skill guides you through interactive rebase, squashing commits, and handling conflicts during rebase to ensure clean merges without repository issues.

Can I recover a commit I accidentally deleted or reset?

Yes; Git preserves deleted commits in the reflog. This Skill covers recovery strategies, stashing workflows, and troubleshooting techniques to minimize data loss and help you undo incorrect commits safely.

What branching and commit naming conventions prevent collaboration errors?

Clear naming conventions for branches and descriptive commit messages reduce confusion and enforce repository integrity across teams. This Skill enforces best practices for branch management, commit workflows, and security practices for collaborative automation.

How do I handle network errors when pushing or pulling from remote repositories?

Network issues interrupt remote operations; this Skill applies exponential backoff retry strategies and error handling to recover gracefully from fetch, pull, and push failures without manual intervention.