skills.rest
roanbrasil
roanbrasilCOMMUNITY
Explore all skills by this author →
Website𝕏@roanbrasilGitHub

git-workflow

Implement Git branching strategies, commit discipline, and PR practices.

5|1|Updated Jun 17, 2026
Search Tags:#git#workflow#branching#pull-requests#conventional-commits#git-bisect#trunk-based-development
One-click install
npx skills add https://github.com/roanbrasil/engineer-grade-agent-skills --skill git-workflow-roanbrasil
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/roanbrasil/engineer-grade-agent-skills/tree/main/skills/git-workflow
Command: npx skills add https://github.com/roanbrasil/engineer-grade-agent-skills --skill git-workflow-roanbrasil

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Inconsistent Git practices across engineering teams lead to messy commit history, frequent merge conflicts, broken CI pipelines, and risky production releases that slow down delivery and introduce avoidable bugs.

Core Features & Use Cases

  • Branching Strategy Selection: Choose the right workflow (Trunk-Based, GitHub Flow, Gitflow) based on team size, CI maturity, and release cadence, with clear decision matrices to avoid common anti-patterns.
  • Commit & PR Discipline: Enforce Conventional Commits, PR size limits, and self-review checklists to keep history clean, reviews fast, and changes fully traceable.
  • Advanced Git Operations: Master git bisect for bug hunting, interactive rebase for history cleanup, cherry-pick for backports, and safe revert/reset practices for shared branches.
  • Use Case: A team shipping weekly feature releases can use this skill to implement Trunk-Based Development with feature flags, eliminating long-lived branch merge hell and reducing deployment risk.

Quick Start

Use the git-workflow skill to implement a Trunk-Based Development workflow with conventional commits and PR templates for your engineering team to reduce merge conflicts and speed up code reviews.

Frequently Asked Questions about git-workflow

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

FAQPage Schema
What is the best git workflow for a team shipping weekly feature releases?▼

For weekly feature releases, Trunk-Based Development with feature flags is recommended to eliminate long-lived branch merge hell and reduce deployment risk. This approach keeps the main branch stable while allowing continuous integration.

How do I enforce conventional commits and PR size limits for my engineering team?▼

You can enforce conventional commits and PR size limits by applying PR templates and self-review checklists. This commit discipline keeps history clean, makes reviews faster, and ensures changes remain fully traceable.

How does git bisect work for finding bugs in an unreadable commit history?▼

Git bisect works by systematically narrowing down the commit that introduced a bug. Maintaining a clean, conventional commit history makes a branch fully bisectable, allowing you to safely isolate and identify problematic code changes.

When should I choose Trunk-Based Development over Gitflow?▼

Choose Trunk-Based Development over Gitflow based on team size, CI maturity, and release cadence. Trunk-Based suits teams needing frequent deployments, while Gitflow is better for projects with strict, scheduled release cycles.

Can I safely rewrite git history on shared branches?▼

Safe history rewriting practices should be strictly limited to unshared branches. For shared branches, use safe revert and reset practices to maintain a clean main branch without disrupting the team's workflow.

Why do frequent merge conflicts occur and how do I stop them?▼

Frequent merge conflicts occur due to inconsistent Git practices and long-lived feature branches. Eliminate them by adopting a consistent branching strategy, conventional commits, and squash merge policies.

Related Skills

Explore More Software Engineering Skills→
cq112233cq112233
21

chinese-git-workflow

Standardize Git workflows and configurations for Chinese hosting services.

Community
Intermediate
Cnext-euCnext-eu
1

SC-merge-pr

Merges a feature branch into main via automated gh CLI pull request.

Official
Intermediate
baphledbaphled
1

feature-flags

Manage feature flags for gradual rollouts, A/B testing, and kill switches.

Community
Intermediate
peopleforresterpeopleforrester
3

branch-strategy

...

Community
Intermediate