git-workflow

Standardize Git branching strategies and complex version control operations.

Updated Jan 6, 2023
One-click install
npx skills add https://github.com/pekral/phpstan-rules --skill git-workflow-pekral
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/pekral/phpstan-rules/tree/main/.claude/skills/git-workflow
Command: npx skills add https://github.com/pekral/phpstan-rules --skill git-workflow-pekral

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This skill resolves uncertainty in Git branching strategies and provides a safe, standardized approach to complex operations like rebasing, conflict resolution, and undoing mistakes.

Core Features & Use Cases

  • Branching Strategy Guidance: Choose between GitHub Flow, Trunk-based, or GitFlow based on team size and release cadence.
  • Safe History Management: Provides clear instructions for rebasing and conflict resolution while strictly avoiding the corruption of shared public history.
  • Recovery Operations: Offers precise commands for undoing commits, stashing work, and managing release tags.

Quick Start

Use the git-workflow skill to rebase your current feature branch onto the latest main branch safely.

Frequently Asked Questions about git-workflow

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

FAQPage Schema
How do I safely rebase a feature branch onto the main branch?

To safely rebase a feature branch, you must synchronize your local branch and strictly avoid rewriting shared public history. The skill provides precise instructions for rebasing operations and conflict resolution while maintaining a linear commit history.

What is the best git branching strategy for my team size and release cadence?

Choosing a git branching strategy depends on your team size and release cadence. This skill guides you through selecting between GitHub Flow, Trunk-based development, or GitFlow to standardize your version control operations and collaboration workflows.

How do I undo a commit or recover lost git history without corrupting the repository?

Recovering lost git history requires precise recovery operations to avoid corrupting shared public history. The skill offers specific commands for undoing commits, stashing work, and managing release tags safely.

How do I resolve merge conflicts while maintaining clean commit conventions?

Resolving merge conflicts cleanly requires adherence to established commit conventions and local branch synchronization policies. The skill standardizes conflict resolution steps to ensure safe history management during complex version control operations.

When should I avoid rebasing in a collaborative version control workflow?

You should avoid rebasing when it risks corrupting shared public history in a collaborative workflow. The skill enforces safe history management by providing clear instructions for local branch synchronization without rewriting public commits.

Does the git-workflow skill support both GitFlow and Trunk-based development?

Yes, the git-workflow skill supports both GitFlow and Trunk-based development, along with GitHub Flow. It helps you choose the appropriate branching strategy based on your team size and release cadence for effective collaboration.