skills.rest
yekinya
yekinyaCOMMUNITY
Explore all skills by this author →
GitHub

moai-ref-git-workflow

Provides git branch strategies, conventional commit formats, and PR templates for git operations.

2|Updated May 27, 2026
Search Tags:#git#workflow#pull request#conventional commits#merge#github flow#branch strategy
One-click install
npx skills add https://github.com/yekinya/moai-novel --skill moai-ref-git-workflow-yekinya
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: moai-ref-git-workflow
Source: https://github.com/yekinya/moai-novel/tree/main/moai-novel/.claude/skills/moai-ref-git-workflow
Command: npx skills add https://github.com/yekinya/moai-novel --skill moai-ref-git-workflow-yekinya

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? Teams often struggle with inconsistent branch naming, messy commit histories, and unclear pull request practices. This reference gives the manager-git agent a standardized set of git workflow patterns so every branch, commit, and PR follows a consistent, reviewable convention. ## Core Features & Use Cases - Branch Strategy Patterns: Covers GitHub Flow, GitFlow, and trunk-based development with naming conventions like feat/SPEC-{ID}-{slug}. - Conventional Commits Reference: Defines commit types (feat, fix, refactor, chore, etc.), message structure, and context-embedding practices for session continuity. - PR Templates and Merge Strategies: Provides a pull request template, merge strategy selection (squash, merge commit, rebase), and git safety rules for destructive commands. - Use Case: When creating a feature branch and opening a PR for SPEC-AUTH-001, the agent applies the feat/SPEC-AUTH-001-jwt-auth naming, writes a conventional commit message, and fills in the PR checklist automatically. ## Quick Start Ask the agent to create a feature branch and pull request for your current change following the standard git workflow conventions.

Frequently Asked Questions about moai-ref-git-workflow

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

FAQPage Schema
How do I write a conventional commit message?▼

Use the format type(scope): description, keeping the first line under 72 characters. Types include feat, fix, refactor, test, docs, chore, perf, style, ci, and revert, with an optional body explaining what and why, plus footers for breaking changes and issue references.

What branch naming convention should I use for features?▼

Use feat/SPEC-{ID}-{slug} for new features, such as feat/SPEC-AUTH-001-jwt-auth. Bug fixes use fix/SPEC-{ID}-{slug}, while refactoring, documentation, and maintenance use refactor/, docs/, and chore/ prefixes respectively.

GitHub Flow vs GitFlow vs trunk-based development, which should I choose?▼

GitHub Flow suits most projects with a deployable main branch and PR-based feature merges. GitFlow fits complex release cycles with develop and release branches. Trunk-based development works best for CI/CD-heavy teams using short-lived branches under one day.

When should I use squash merge vs merge commit?▼

Use squash merge for feature branches to keep history clean with gh pr merge --squash. Use merge commits for release branches to preserve full history, and rebase only for small, clean commit sets.

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

No, force push to main or shared branches is prohibited because collaborators or CI may have fetched the branch. If force pushing is unavoidable on a personal branch, use --force-with-lease instead of --force.

Related Skills

Explore More Software Engineering Skills→
estaciolimaestaciolima

speckit-git-feature

Automates Git feature-branch creation and initialization in spec-kit projects.

Community
Intermediate
greencmgreencm
1

land-and-deploy

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

Community
Advanced
trust-chain-organizationtrust-chain-organization

project-conventions

Enforce Polibase project conventions during commits, PRs, and CI/CD failures.

Official
Intermediate
marquesfelipmarquesfelip

automated-versioning

Automate semantic version bumps from conventional commits in CI/CD pipelines.

Community
Advanced