source-control

Standardize Git commit messages and branching strategies with conventional commit formats.

16|2|Updated Nov 9, 2025
One-click install
npx skills add https://github.com/maroffo/claude-forge --skill source-control
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: source-control
Source: https://github.com/maroffo/claude-forge/tree/main/skills/source-control
Command: npx skills add https://github.com/maroffo/claude-forge --skill source-control

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

This Skill standardizes your Git workflow, ensuring consistent commit messages, efficient branching strategies, and robust conflict resolution, leading to cleaner code and smoother collaboration.

Core Features & Use Cases

  • Conventional Commits: Enforces a standardized format for commit messages (<type>(<scope>): <subject>) for better readability and automated changelog generation.
  • Branching Strategy: Provides clear guidelines for feature, fix, and hotfix branches.
  • Workflow Management: Details best practices for rebasing, merging, and handling merge conflicts.
  • Recovery: Offers commands to undo mistakes and recover lost work.
  • Use Case: When you've completed a new feature, use this Skill to ensure your commit messages follow the conventional format and your branch is merged cleanly into the main branch.

Quick Start

Use the source-control skill to commit your staged changes with the message "feat: implement user login".

Frequently Asked Questions about source-control

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

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

How do I write conventional commit messages for Git? Conventional commit messages follow the format `<type>(<scope>): <subject>` to standardize Git history. This structure improves readability, enables automated changelog generation, and clarifies the intent of changes like new features or fixes.

What is the best way to structure Git branching for feature development?

What is the best way to structure Git branching for feature development? The best way to structure Git branching is using dedicated feature, fix, and hotfix branches. This workflow isolates development efforts, ensures the main branch remains stable, and leads to cleaner code and smoother team collaboration.

How do I handle merge conflicts during a Git rebase?

How do I handle merge conflicts during a Git rebase? To handle merge conflicts during a Git rebase, apply workflow management best practices for resolving divergent histories. Standardizing your source control process ensures robust conflict resolution and maintains a clean, linear project history.

Can I recover lost work or undo a bad Git commit?

Can I recover lost work or undo a bad Git commit? Yes, you can recover lost work or undo a bad Git commit using specific recovery commands. Applying defined source control recovery patterns allows developers to safely undo mistakes and restore previous code states.

Do I need prior Git experience to use conventional commit workflows?

Do I need prior Git experience to use conventional commit workflows? You need intermediate familiarity with Git operations to use conventional commit workflows effectively. Understanding basic staging, branching, and merging is required to apply these source control standards and maintain code quality.