skills.rest
tcvdog
tcvdogCOMMUNITY
Explore all skills by this author →
GitHub

Git Workflow Master

Guides Git branching strategies, conventional commits, rebasing, and worktree workflows for version control.

2|Updated May 21, 2026
Search Tags:#git#code review#version control#worktrees#conventional commits#rebase#branching strategy
One-click install
npx skills add https://github.com/tcvdog/agency-agents-hermes --skill git-workflow-master-tcvdog
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: Git Workflow Master
Source: https://github.com/tcvdog/agency-agents-hermes/tree/main/engineering/git-workflow-master
Command: npx skills add https://github.com/tcvdog/agency-agents-hermes --skill git-workflow-master-tcvdog

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? Teams struggle with messy commit histories, merge conflicts, and inconsistent branching practices that slow down collaboration and releases. This Skill provides expert guidance on Git workflows to keep repositories clean and CI-friendly. ## Core Features & Use Cases - Branching Strategy Design: Choose between trunk-based development and Git Flow based on team size and release cadence. - Commit Hygiene: Enforce atomic commits and conventional commit formats like feat:, fix:, and chore:. - Advanced Git Operations: Get safe guidance on interactive rebase, worktrees, bisect, cherry-pick, and reflog recovery. - Use Case: A developer finishing a feature branch can follow the rebase-and-force-with-lease workflow to clean up commits before opening a pull request, then merge safely without disrupting shared branches. ## Quick Start Ask the agent to help you clean up your feature branch commits with an interactive rebase before merging into main.

Frequently Asked Questions about Git Workflow Master

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

FAQPage Schema
How do I clean up commits before a pull request?▼

Use git rebase -i origin/main to squash fixup commits and reword messages interactively. Then push safely with git push --force-with-lease, which protects against overwriting others' changes on your branch.

Trunk-based development vs Git Flow, which should I use?▼

Trunk-based development with short-lived feature branches is recommended for most teams because main stays always deployable. Git Flow suits versioned releases where you need separate develop and release branches.

Is it safe to force-push to a shared branch?▼

Never force-push shared branches directly. If you must rewrite history on your own branch, use git push --force-with-lease, which fails if someone else has pushed changes you haven't seen.

How do I work on multiple branches at the same time in Git?▼

Use git worktree add ../my-feature feat/my-feature to check out a branch in a separate directory. This lets you work in parallel without stashing or switching branches in your main working tree.

What is the conventional commits format?▼

Conventional commits prefix messages with a type such as feat:, fix:, chore:, docs:, refactor:, or test:. Each commit should be atomic, doing one thing so it can be reverted independently.

Related Skills

Explore More Software Engineering Skills→
tradertunantetradertunante

git-workflow-and-versioning

Enforce disciplined Git workflows for branching, committing, and conflict resolution.

Community
Advanced
amo-tech-aiamo-tech-ai

cicd-pipeline

Automate GitHub Actions CI/CD pipelines for build, test, lint, and deployment workflows.

Community
Intermediate
limaonlimaon

requesting-code-review

Evaluate code changes for quality and compliance before merging.

Community
Basic
hung-phanhung-phan

trunk-based-development

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

Community
Advanced