git

Guide Git operations including branching, commit messages, merge, rebase, and conflict resolution.

3|Updated Feb 24, 2026
One-click install
npx skills add https://github.com/oddship/bosun --skill git-oddship
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: git
Source: https://github.com/oddship/bosun/tree/main/.pi/skills/git
Command: npx skills add https://github.com/oddship/bosun --skill git-oddship

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

This Skill provides comprehensive guidance and best practices for all Git operations, ensuring efficient and error-free version control.

Core Features & Use Cases

  • Commit Best Practices: Learn to write clear, conventional commit messages.
  • Branching & Merging: Understand merge vs. rebase and effective branching strategies.
  • Conflict Resolution: Get step-by-step help to resolve merge conflicts.
  • Use Case: When starting a new feature, use this Skill to learn the recommended branching strategy and how to structure your commit messages for clarity.

Quick Start

Use the git skill to learn how to create a new branch for a feature.

Frequently Asked Questions about git

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

FAQPage Schema
What is the best way to write conventional commit messages in version control?

Conventional commit messages in version control should be structured clearly to indicate the nature of changes. This skill provides guidance on commit message conventions to help you maintain clean, consistent commit histories for better team collaboration.

How do I resolve merge conflicts when branching strategies overlap?

To resolve merge conflicts during branching, you need step-by-step conflict resolution guidance. This skill helps you navigate conflicting code changes to maintain code integrity and ensure efficient version control workflows.

When should I use rebase instead of merge in my Git workflow?

You should choose between rebase and merge based on your branching strategy and history requirements. This skill explains the differences between merge and rebase to help you decide the best approach for maintaining a clean project history.

How to create a new branch for a feature following version control best practices?

Creating a new branch for a feature requires following recommended branching strategies to keep workflows efficient. This skill supports developers by outlining effective branching techniques to start features without disrupting code integrity.