skills.rest
pjherron
pjherronCOMMUNITY
Explore all skills by this author →
GitHub

git-workflow

Guides Git branching strategies, commit conventions, and collaborative development workflows.

Updated Jul 16, 2026
Search Tags:#git#code review#version control#branching#pull requests#merge conflicts#commit conventions
One-click install
npx skills add https://github.com/pjherron/hypoc --skill git-workflow-pjherron
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/pjherron/hypoc/tree/main/hypoc/skills/git-workflow
Command: npx skills add https://github.com/pjherron/hypoc --skill git-workflow-pjherron

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? Teams struggle with inconsistent branching strategies, unclear commit messages, merge conflicts, and risky history rewrites, leading to broken builds and lost work. ## Core Features & Use Cases - Branching Strategy Selection: Compares GitHub Flow, Trunk-Based Development, and GitFlow with decision criteria based on team size and release cadence. - Commit & PR Conventions: Provides Conventional Commits formatting, PR templates, and code review checklists for consistent collaboration. - Conflict Resolution & Recovery: Covers merge vs rebase decisions, conflict resolution steps, stash workflows, and safe undo patterns. - Use Case: A team lead setting up a new repository can use this Skill to pick a branching model, configure commit message templates, and document PR standards for all contributors. ## Quick Start Ask the AI to recommend a branching strategy and commit conventions for a five-person team deploying a web app continuously.

Frequently Asked Questions about git-workflow

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

FAQPage Schema
How do I choose between GitFlow, GitHub Flow, and trunk-based development?▼

GitHub Flow suits continuous deployment and small-to-medium teams, trunk-based development fits experienced teams with feature flags deploying multiple times daily, and GitFlow works for scheduled releases in enterprise or regulated environments.

How to write good commit messages with Conventional Commits?▼

Use the format type(scope): subject, with types like feat, fix, docs, refactor, and test. Keep the subject in imperative mood under 50 characters, and use the body to explain why the change was made.

When should I use git rebase vs git merge?▼

Use merge when integrating feature branches into main to preserve history, especially on shared branches. Use rebase to update a local-only feature branch with the latest main for a clean linear history, but never rebase pushed or shared branches.

How do I resolve merge conflicts in Git?▼

Run git status to list conflicted files, then edit the conflict markers manually, use git mergetool, or accept one side with git checkout --ours or --theirs. Stage the resolved files with git add and commit to complete the merge.

How do I undo a commit that was already pushed?▼

Use git revert HEAD to create a new commit that undoes the changes, then push normally. Avoid git reset --hard or force pushes on shared branches because they rewrite public history and break collaborators' work.

Related Skills

Explore More Software Engineering Skills→
Jin9Jin9

publishing-git-review-requests

Commits, pushes, and opens GitHub PRs or GitLab MRs for local changes.

Community
Advanced
greencmgreencm
1

land-and-deploy

Merge pull requests, run CI tests, and deploy to production with canary checks.

Community
Advanced
kotakbiasakotakbiasa

requesting-code-review

Automate pre-commit code review with security scans and quality gates.

Community
Advanced
hung-phanhung-phan

trunk-based-development

Implement a trunk-based development workflow with short-lived branches and feature flags.

Community
Advanced