git-workflow

Guide Git branching, merging, and conflict resolution workflows.

Updated Sep 30, 2025
One-click install
npx skills add https://github.com/chlmm/changex-notes --skill git-workflow-chlmm
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/chlmm/changex-notes/tree/main/Resource/other-skills/skills/git-workflow
Command: npx skills add https://github.com/chlmm/changex-notes --skill git-workflow-chlmm

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

This Skill addresses the complexity of managing Git workflows, helping teams and individuals adopt best practices for version control and collaboration.

Core Features & Use Cases

  • Guidance on Commit Messages: Ensures clear, semantic commit practices following conventional standards.
  • Branching Strategies: Provides detailed workflows like Git Flow, GitHub Flow, and Trunk-Based development to structure development processes.
  • Pull Request and Merge Conflict Handling: Offers best practices for code reviews, conflict resolution, and collaboration. Ideal for software teams aiming to streamline their Git operations.

Quick Start

Use the git-workflow skill to understand how to set up and manage feature branches and resolve merge conflicts efficiently.

Frequently Asked Questions about git-workflow

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

FAQPage Schema
What is the best way to structure Git branching for a team?

The best Git branching strategy depends on your team's release cadence, utilizing models like Git Flow, GitHub Flow, or Trunk-Based development to structure development processes. This skill provides detailed workflows and diagrams to help teams implement the appropriate branching strategy.

How do I resolve merge conflicts during a pull request?

Resolving merge conflicts during a pull request involves identifying conflicting branches, manually editing files to reconcile changes, and committing the resolution. This skill offers best practices for pull request handling and conflict resolution to streamline team collaboration.

How should I format commit messages for version control?

Commit messages for version control should follow clear, semantic conventional standards to ensure project history is readable. This skill provides explicit guidance on structuring commit messages to maintain discipline and clarity within collaborative coding environments.

When do I need Trunk-Based development instead of GitHub Flow?

You need Trunk-Based development instead of GitHub Flow when you require rapid integration and heavy automation, whereas GitHub Flow suits simpler, continuous deployment models. This skill compares branching strategies to help you choose the right version control workflow.

Can I use these Git workflows for individual side projects?

Yes, you can use these Git workflows for individual side projects to build version control discipline, though they are primarily designed for collaborative, team-based environments. The provided methodologies help individuals adopt best practices for branching and merging.