skills.rest
Claude-Code-Community-Ireland
Claude-Code-Community-IrelandOFFICIAL
Explore all skills by this author →
GitHub

git-workflow

Guide Git workflows with conventional commits, rebasing, and conflict resolution.

10|5|Updated Jan 29, 2026
Search Tags:#git#workflow#collaboration#version control#commit messages#rebase
One-click install
npx skills add https://github.com/Claude-Code-Community-Ireland/claude-code-resources --skill git-workflow-claude-code-community-ireland
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/Claude-Code-Community-Ireland/claude-code-resources/tree/main/plugins/vibeworks-library/skills/git-workflow
Command: npx skills add https://github.com/Claude-Code-Community-Ireland/claude-code-resources --skill git-workflow-claude-code-community-ireland

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

This Skill helps developers adhere to Git best practices, ensuring cleaner commit histories, more efficient collaboration, and easier debugging through standardized commit messages and workflow management.

Core Features & Use Cases

  • Conventional Commits: Enforces a standardized format for commit messages (<type>(<scope>): <description>).
  • Commit Atomicity: Guides users to make each commit a single logical change.
  • Interactive Rebase: Provides commands and explanations for cleaning up local history.
  • Merge vs. Rebase: Clarifies when to use each strategy.
  • Conflict Resolution: Offers strategies for resolving merge conflicts.
  • Git Hooks: Explains common hooks like pre-commit and commit-msg.
  • Stashing & Cherry-Picking: Details commands for managing temporary changes and applying specific commits.
  • Git Bisect: Introduces the tool for finding bugs by binary search.

Quick Start

Use the git-workflow skill to learn how to reword the last commit message.

Frequently Asked Questions about git-workflow

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

FAQPage Schema
How do I write conventional commit messages for cleaner Git history?▼

Conventional commit messages follow the format `<type>(<scope>): <description>` to standardize Git history. This Skill enforces this structure, ensuring commits are atomic and represent a single logical change for easier debugging and team collaboration.

When should I use Git rebase instead of a merge?▼

Git rebase rewrites local history to maintain a linear project timeline, while merging preserves the complete branch history. This Skill clarifies when to use each strategy, offering specific commands for interactive rebasing to clean up commits before sharing.

What is the best way to resolve Git merge conflicts?▼

Resolving Git merge conflicts requires clear strategies to combine competing changes. This Skill provides structured conflict resolution workflows, alongside advanced operations like stashing temporary changes and cherry-picking specific commits to isolate and apply fixes.

How does Git bisect work for finding bugs?▼

Git bisect performs a binary search through commit history to identify the exact commit that introduced a bug. This Skill introduces the tool and details the commands needed to automate debugging and efficiently pinpoint regressions.

Can I use Git hooks to automate commit message formatting?▼

Git hooks like `pre-commit` and `commit-msg` automate checks before changes are finalized. This Skill explains how to configure these hooks to enforce conventional commit standards and prevent non-compliant code from entering the repository.

Related Skills

Explore More Software Engineering Skills→
alexanderopalexanderop

using-git-worktrees

Create isolated git worktrees for feature branches with safety checks.

Community
Advanced
avvaleavvale

conventional-commits

Validate commit messages against the Conventional Commits specification.

Official
Basic
bailynlovebailynlove
1

requesting-code-review

Automate pre-commit code verification with static security scanning and quality gates.

Community
Advanced
markus41markus41
1

gitworfkflows

Manage Git branching, commits, rebasing, and pull requests.

Community
Basic