Can this skill help with merge conflicts?

Yes, it includes detailed procedures for identifying, manually resolving, and finalizing merges when code conflicts occur.

Does it follow Git best practices?

Yes, it emphasizes small focused commits, conventional commit messages, and safety warnings against force-pushing to public branches.

Can it help undo accidental commits?

Absolutely, it covers multiple history management techniques including soft/hard resets, reverts, and using the reflog to recover lost work.

Does it support GitHub specific commands?

Yes, the skill is configured to use both standard Git and github-cli (gh) tools for seamless remote and PR management.

What is the Git Claude Code Skill?

It is a specialized extension that provides Claude with a comprehensive knowledge base and standardized patterns for managing Git operations efficiently.

Git Workflow & Version Control

Name: Git Workflow & Version Control
Author: nerver111

bynerver111

0•

開発者ツール

Manage the complete Git lifecycle from repository initialization to advanced team collaboration and conflict resolution.

This skill provides Claude with comprehensive expertise in Git version control, offering a standardized approach to repository management, branching strategies, and collaborative workflows. It covers everything from basic commits and staging to advanced operations like interactive rebasing, merge conflict resolution, and history management using both Git and GitHub CLI. Whether setting up a new project or troubleshooting complex repository states, this skill ensures best practices are followed to maintain a clean, professional, and accessible commit history.

主な機能

01Comprehensive merge and rebase workflows with conflict resolution guidance

020 GitHub stars

03Advanced branching management including renaming, deletion, and comparison

04Detailed history manipulation through resets, reverts, and interactive rebasing

05Standardized repository initialization and cloning strategies

06Remote repository management and upstream synchronization using GitHub CLI

ユースケース

01Resolving complex merge conflicts and performing history clean-up via interactive rebase

02Managing feature-branch workflows and contributing to open-source projects via forks

03Setting up a new project with a professional Git structure and conventional commit patterns

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add nerver111/git-skill-test git

For use in Claude.ai and ChatGPT