Can this skill help find when a bug was introduced?

Yes, it includes documentation on using 'git bisect', which performs a binary search through your commit history to identify the specific change that caused a regression.

When should I choose rebase over merge?

Use rebase for updating feature branches from main and cleaning up local commits to maintain a linear history. Use merge for integrating finished feature branches back into the main codebase.

How does this skill assist with merge conflicts?

It provides a step-by-step workflow for identifying 'both modified' files and comparing base, current (ours), and incoming (theirs) versions to make informed resolution decisions.

What is the Conventional Commit format used in this skill?

The skill follows the ' ( ): ' format, utilizing types like feat, fix, refactor, and chore to create a machine-readable and human-friendly commit history.

Git Workflow & Best Practices

Name: Git Workflow & Best Practices
Author: Claude-Code-Community-Ireland

byClaude-Code-Community-Ireland

•

Developer Tools

Streamlines version control with conventional commits, interactive rebasing, and professional repository hygiene standards.

This skill provides a comprehensive framework for maintaining a clean and professional Git history within Claude Code. It equips developers with standardized commit message formats, precise interactive rebase techniques, and efficient conflict resolution patterns. By implementing these best practices, teams can ensure commit atomicity, maintain a linear history, and leverage advanced tools like Git Bisect and customized Git hooks to improve overall code quality and collaboration speed.

Key Features

01Curated .gitignore patterns for Node.js, Python, Java, and IDE environments

026 GitHub stars

03Advanced utility guides for Git Bisect, stashing, and cherry-picking

04Standardized conflict resolution strategies for complex merge scenarios

05Interactive rebase guidance for squashing, splitting, and reordering commits

06Conventional Commit formatting with type, scope, and breaking change indicators

Use Cases

01Automating code quality checks using pre-commit and commit-msg Git hooks

02Cleaning up local development history before submitting a pull request

03Enforcing a unified commit message standard across a distributed engineering team

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add claude-code-community-ireland/claude-code-resources git-workflow

For use in Claude.ai and ChatGPT

Download Skill