git-workflow

Enforce professional Git practices for atomic commits and clean linear history.

1|Updated May 5, 2026
One-click install
npx skills add https://github.com/kollaborai/kollab --skill git-workflow-kollaborai
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/kollaborai/kollab/tree/main/bundles/skills/git-workflow
Command: npx skills add https://github.com/kollaborai/kollab --skill git-workflow-kollaborai

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill eliminates the common pain points of messy Git commit history, broken work-in-progress commits, unresolved merge conflicts, and inconsistent version control practices that lead to lost work, team collaboration friction, and unreleasable codebases.

Core Features & Use Cases

  • Comprehensive Git Best Practices: Covers end-to-end version control workflows including environment setup, branching conventions, commit hygiene, merge/rebase strategies, conflict resolution, history inspection, and mistake recovery.
  • Strict Collaboration Guardrails: Enforces mandatory rules like never committing broken code, never rebasing shared branches, and using feature branches for all work to prevent disruptions to team workflows.
  • Real-World Use Case: A developer working on a team feature can use this Skill to maintain a clean, linear commit history, safely resolve merge conflicts, and avoid accidental force pushes to shared branches that would break teammates' work.

Quick Start

Use the git-workflow skill to configure your Git environment, create a properly named feature branch for your new task, and commit your changes following professional best practices.

Frequently Asked Questions about git-workflow

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

FAQPage Schema
How do I resolve merge conflicts and keep a clean linear history in git?

To resolve merge conflicts and maintain a clean linear history, use safe rebasing strategies on local feature branches and enforce strict commit hygiene. This avoids broken commits and ensures a consistent, releasable codebase across team workflows.

What is the best way to recover lost commits or undo an accidental force push in git?

Recover lost commits or undo an accidental force push by applying mistake recovery techniques to local and remote repositories. This restores previous branch states and prevents lost work caused by improper version control practices.

How do I configure git branching conventions for team feature development and hotfixes?

Configure git branching conventions by creating properly named feature branches for all work, separating hotfixes and releases, and enforcing rules against committing broken code. This eliminates collaboration friction and unreleasable codebases.

Why should I avoid rebasing shared branches in version control workflows?

Avoid rebasing shared branches to prevent breaking teammates' work and causing unresolved merge conflicts. Enforcing strict collaboration guardrails on remote repositories ensures safe version control and protects shared commit history.

How do I create atomic commits in git for professional code collaboration?

Create atomic commits in git by grouping logical changes into single, self-contained commits that never include broken work-in-progress code. This enforces professional version control practices and eliminates messy git history.