git-workflow

Guide Git workflows with branching strategies and Conventional Commits.

Updated Mar 12, 2026
One-click install
npx skills add https://github.com/mefardales/skillbox --skill git-workflow-mefardales
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/mefardales/skillbox/tree/main/skills/general/git-workflow
Command: npx skills add https://github.com/mefardales/skillbox --skill git-workflow-mefardales

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

This Skill streamlines your Git workflow, ensuring cleaner histories, fewer merge conflicts, and more efficient collaboration among team members.

Core Features & Use Cases

  • Branching Strategies: Implements trunk-based development with clear guidelines for feature branches.
  • Commit Conventions: Enforces Conventional Commits for understandable and automated changelogs.
  • Workflow Optimization: Provides step-by-step guidance for daily Git operations, including rebasing, conflict resolution, and stashing.
  • Use Case: A developer needs to create a new feature, ensuring their commits are well-formatted and their branch is kept up-to-date with the main branch before submitting a pull request.

Quick Start

Follow the daily workflow to start a new feature branch from main and make your first commit.

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 commits for team collaboration?

The best way to structure Git commits for team collaboration is using Conventional Commits, which enforce a standardized message format to generate understandable histories and automate changelogs. This approach keeps project histories clean and manageable.

How do I manage feature branches to avoid merge conflicts?

To manage feature branches and avoid merge conflicts, implement trunk-based development with clear guidelines for feature branches. Following daily operational procedures like rebasing keeps your branch up-to-date with the main branch before submitting a pull request.

How do I resolve Git merge conflicts during daily operations?

You resolve Git merge conflicts during daily operations by following step-by-step workflow optimization guidance, which includes specific procedures for rebasing, conflict resolution, and stashing to maintain a clean project history.

Does this Git workflow guidance support individual developers or only team collaboration?

This Git workflow guidance supports both individual developers and team collaboration, addressing specific scenarios for each to maintain a clean and manageable project history through structured commit messages and efficient branch management.

When do I need to use Git rebasing instead of merging?

You need to use Git rebasing instead of merging when you want to keep your feature branch up-to-date with the main branch before a pull request, ensuring a linear project history and fewer merge conflicts during daily operations.