skills.rest
lanegrid
lanegridOFFICIAL
Explore all skills by this author →
GitHub

git-workflow

Enforce branching strategies, Conventional Commits, and PR workflows in Git.

59|4|Updated Dec 2, 2025
Search Tags:#git#workflow#branching#code-review#pull-request#conventional-commits
One-click install
npx skills add https://github.com/lanegrid/agtrace --skill git-workflow-lanegrid
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/lanegrid/agtrace/tree/main/.agent/skills/git-workflow
Command: npx skills add https://github.com/lanegrid/agtrace --skill git-workflow-lanegrid

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill standardizes Git workflows across teams by providing a clear set of branching rules, commit conventions, and PR practices to reduce merge conflicts and streamline reviews.

Core Features & Use Cases

  • Branching Strategy: Always branch from origin/main to ensure consistency across environments; supports git worktrees; consistent branch naming conventions (e.g., feature/, fix/, docs/).
  • Commit Message Format: Enforces Conventional Commits style to improve changelog generation and traceability.
  • PR Creation & Post-Merge Cleanup: Provides a repeatable PR workflow and post-merge steps to clean up branches and keep main in a healthy state.
  • Use Case: A feature team starts from origin/main, creates a feature branch, commits with conventional messages, opens a PR, and upon merge performs cleanup across workers.

Quick Start

Use the git-workflow skill to standardize your team's Git practices. Start by updating your local repo to the latest main, create a feature branch, commit with a conventional message, push, and open a PR.

Frequently Asked Questions about git-workflow

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

FAQPage Schema
How do I standardize Git branching strategies and pull requests across my team?▼

A standardized Git workflow enforces branching from origin/main, requires Conventional Commits for messages, and automates pull request creation with post-merge cleanup to keep main healthy.

What is the best way to enforce Conventional Commits in a Git pull request workflow?▼

The best way to enforce Conventional Commits in a pull request workflow is to mandate the format during commits, which improves changelog generation and traceability before opening a PR from a feature branch.

Can I use git worktrees with a standardized branch and PR workflow?▼

Yes, you can use git worktrees with a standardized branch workflow. The workflow supports branching from origin/main and performing post-merge cleanup across multiple worktrees to maintain a healthy main branch.

How do I clean up feature branches after a pull request is merged?▼

You clean up feature branches after a pull request merge by executing post-merge cleanup steps that remove merged branches, keeping the main repository healthy across all local workers.

Why should my development team branch from origin/main instead of local main?▼

Branching from origin/main ensures consistency across environments by pulling the latest remote state. This practice reduces merge conflicts and aligns with a standardized pull request workflow for collaborative development.

Related Skills

Explore More Software Engineering Skills→
IAmKongHaiIAmKongHai

ce-clean-gone-branches

Remove local branches and worktrees deleted from the remote repository.

Community
Basic
JulesDupsJulesDups

commit-push

Stage, commit, merge into main with --no-ff, push, and audit workspace cleanup.

Community
Advanced
eysenfalkeysenfalk

git-workflow

Enforce Git branch naming, commit message formats, and merge policies.

Community
Advanced
gkswls5006-webgkswls5006-web

moai-ref-git-workflow

Consolidate Git branching, commit, and pull request practices into a reference guide.

Community
Advanced