02 — Version Control & Git

placeholder

Updated Feb 15, 2026

Search Tags:#git #workflow #code review #collaboration #version control #commit messages #branching

Ready to run

npx skills add https://github.com/ftnilsson/agent-cli --skill 02-version-control-git

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: 02 — Version Control & Git
Source: https://github.com/ftnilsson/agent-cli/tree/main/development/skills/02-version-control-and-git
Command: npx skills add https://github.com/ftnilsson/agent-cli --skill 02-version-control-git

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

This Skill empowers developers to use Git effectively for both individual productivity and team collaboration, moving beyond basic commands to advanced workflows.

Core Features & Use Cases

Effective Branching Strategies: Learn Trunk-Based Development, GitHub Flow, and Git Flow.
Atomic Commits & Hygiene: Craft clear, meaningful commit messages and ensure each commit is a logical unit.
Conflict Resolution & Recovery: Understand how to resolve merge conflicts and recover from mistakes using tools like git reflog.
Advanced Techniques: Utilize bisect, worktrees, stash, and cherry-pick for complex scenarios.
Use Case: Ensure all team members follow consistent Git practices, leading to cleaner history, fewer merge conflicts, and a more robust development process.

Quick Start

Follow the instructions to configure your global Git settings for optimal use.

Frequently Asked Questions about 02 — Version Control & Git

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

FAQPage Schema

What is the best way to structure Git branching strategies for a development team?▼

Git branching strategies like Trunk-Based Development, GitHub Flow, and Git Flow structure team collaboration. Choosing the right workflow ensures a cleaner commit history, fewer merge conflicts, and a more robust development process.

How do I write effective Git commit messages for better code review?▼

Writing effective Git commit messages requires crafting clear, meaningful descriptions and ensuring each commit is a logical unit. This atomic commit hygiene improves individual productivity and streamlines code review.

How do I resolve merge conflicts and recover lost commits in Git?▼

Resolve merge conflicts and recover lost commits in Git by understanding conflict resolution techniques and using recovery tools like git reflog. These history manipulation methods safely restore previous working states.

When should I use advanced Git techniques like bisect, worktrees, and cherry-pick?▼

Use advanced Git techniques like bisect, worktrees, stash, and cherry-pick for complex version control scenarios. These commands handle isolated bug tracking, parallel branch management, and targeted code integration.

What do I need to configure before setting up Git for team collaboration?▼

Setting up Git for team collaboration requires configuring your global Git settings for optimal use. This initial environment setup standardizes individual workflows and ensures consistent version control practices across the team.