Overview

This skill covers commit guidelines, branching strategy, and collaboration practices to maintain clean history and a stable main branch. It emphasizes conventional commits, atomic changes, feature branches, pull requests, and timely conflict resolution.

How This Skill Works

Developers create feature branches off main, write atomic commits with conventional types (feat, fix, docs), and reference issues when applicable. Teams merge or rebase according to local conventions, then delete merged branches to keep the repo tidy. Pull requests are used to review changes and coordinate collaboration.

When to Use It

• Starting a new feature on a dedicated branch
• Fixing a bug while keeping main stable
• Preparing changes with pull requests for review
• Choosing rebase vs. merge based on team conventions
• Cleaning up after merge by deleting branches

Quick Start

1. Step 1: Create a feature branch off main (git checkout -b feature/your-idea)
2. Step 2: Make atomic commits with conventional types (feat, fix, docs) and reference issues
3. Step 3: Open a pull request, complete code review, merge, and delete the branch

Best Practices

• Write clear, descriptive commit messages
• Use conventional commit format (feat, fix, docs, etc.)
• Keep commits atomic and focused
• Reference issue numbers when applicable
• Pull frequently, review diffs, and resolve conflicts before merging

Example Use Cases

• Create feature branch for a new UI component and commit with feat
• Fix a bug with an atomic fix commit referencing issue #123
• Rebase local feature branch to keep a clean history before PR
• Open a PR and undergo code review before merging into main
• Delete branches after merge to maintain a tidy repository

Frequently Asked Questions