skills.rest
homeslands
homeslandsCOMMUNITY
Explore all skills by this author →
GitHub

git-workflow

Enforces branch naming, Conventional Commits, and PR conventions for Git workflows.

Updated Aug 19, 2026
Search Tags:#git#code review#version control#pull request#conventional commits#merge conflicts#branch naming
One-click install
npx skills add https://github.com/homeslands/trend-ui --skill git-workflow-homeslands
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/homeslands/trend-ui/tree/main/app/order-ui/.claude/skills/git-workflow
Command: npx skills add https://github.com/homeslands/trend-ui --skill git-workflow-homeslands

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? Teams often end up with inconsistent branch names, vague commit messages, and messy pull requests that make history hard to read and CI harder to keep green. This Skill standardizes Git conventions for the order-ui project so every commit, branch, and PR follows the same rules. ## Core Features & Use Cases - Branch Naming Enforcement: Applies the Jira-linked format (feature/TRE-XXX-FE-description, bugfix/, hotfix/) with lowercase, hyphen-only naming. - Conventional Commits: Generates commit messages with proper type, project scope (auth, order, payment, printer, etc.), imperative mood, and 72-character limits. - PR and Merge Standards: Produces structured PR bodies with test plans, enforces squash merges, and guides rebase-based conflict resolution. - Use Case: When you finish a payment bug fix, ask for a commit and PR — you get a message like "fix(payment): prevent navigation after failed order creation" plus a complete PR template with ticket reference and checklist. ## Quick Start Ask the assistant to create a branch and commit message for your current change following the project Git conventions.

Frequently Asked Questions about 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): summary, such as feat(printer): add printer connector API. Choose a type like feat, fix, refactor, or chore, use a project scope like order or payment, write in imperative mood, and keep the summary under 72 characters with no trailing period.

How should I name a Git branch for a Jira ticket?▼

Use the pattern feature/TRE-XXX-FE-description for features or bugfix/TRE-XXX-FE-description for fixes, always including the ticket ID. Use lowercase with hyphens only, and base the branch off main.

What checks should pass before committing code?▼

Run npm run lint with zero warnings, npx tsc -b with exit code 0, and npm run test with all tests passing. Never commit console.log statements, TypeScript errors, or use the --no-verify flag to bypass hooks.

How do I resolve merge conflicts with rebase?▼

Fetch origin and run git rebase origin/main, then resolve conflicts by reading both versions of each file rather than blindly accepting one side. Stage resolved files and continue with git rebase --continue.

When should a commit message include a body?▼

Add a body when the reason for the change is not obvious from the summary alone. Explain the underlying problem and the approach taken, such as describing a race condition and the queue mechanism added to fix it.

Related Skills

Explore More Software Engineering Skills→
NVIDIANVIDIA
2.8k

cuopt-installation-developer

Set up a cuOpt development environment for source builds and tests.

Official
Advanced
dimakisdimakis

land-pr

Shepherd GitHub pull requests through CI checks, reviews, and squash merges.

Community
Intermediate
erfanzarerfanzar
27

requesting-code-review

Automate pre-commit code review with static checks, linting, and auto-fixes.

Community
Advanced
wahidyankfwahidyankf
3

repo-practicing-trunk-based-development

Enforce small, frequent commits to the main branch for Trunk Based Development workflows.

Community
Advanced