Git Workflow and Versioning

The Git Workflow and Versioning skill provides a structured approach to managing code changes using Git. It emphasizes trunk-based development, atomic commits, and descriptive messages to maintain a manageable and reversible codebase. This skill is designed for use in any code change scenario, including committing, branching, resolving conflicts, and organizing work across multiple parallel streams. It is particularly useful in environments where AI agents generate code at high speed, requiring disciplined version control to keep changes organized and reviewable. Key capabilities include: - Trunk-Based Development: Keeping the main branch always deployable with short-lived feature branches. - Commit Early, Commit Often: Committing small, incremental changes for easier review and rollback. - Atomic Commits: Ensuring each commit represents a single logical change. - Descriptive Messages: Writing clear commit messages that explain the intent behind changes. - Branching Strategy: Using feature branches for new features and fix branches for bug fixes. - Worktrees: Running multiple branches simultaneously for parallel AI agent work. Example use case: When developing a new feature in a large codebase, this skill helps maintain a clean and organized code history, making it easier to review and integrate changes.