skills.rest
kid-sid
kid-sidCOMMUNITY
Explore all skills by this author →
GitHub

git-workflow

Enforce conventional commits, branch naming, and safe force-push rules in Git workflows.

18|1|Updated Apr 17, 2026
Search Tags:#git#workflow#pull-requests#conventional-commits#branch-naming#merge-strategy#repository-hygiene
One-click install
npx skills add https://github.com/kid-sid/codex-spellbook --skill git-workflow-kid-sid
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/kid-sid/codex-spellbook/tree/main/skills/git-workflow
Command: npx skills add https://github.com/kid-sid/codex-spellbook --skill git-workflow-kid-sid

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Inconsistent Git workflows lead to messy, unreadable commit history, confusing code reviews, accidental data loss from unsafe force pushes, and friction when collaborating with team members on shared repositories.

Core Features & Use Cases

  • Standardized Branch Naming: Enforces consistent feat/, fix/, and chore/ branch patterns to make repository structure immediately understandable.
  • Conventional Commit Guidance: Provides clear rules for commit formatting to make change history scannable and automatable.
  • Safe Merge & Rewrite Rules: Outlines when to squash, merge, or rebase, and enforces safe force-push practices to avoid disrupting shared branch history.
  • Use Case: For example, when joining a new team project, use this skill to align your local Git workflow with team standards, avoid overwriting teammates' work, and ensure your pull requests are easy to review and merge.

Quick Start

Use the git-workflow skill to create a properly named feature branch for adding user authentication, write a compliant conventional commit for your initial changes, and select the appropriate merge strategy before opening a pull request for review.

Frequently Asked Questions about git-workflow

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

FAQPage Schema
How do I enforce conventional commits and branch naming in my git workflow?▼

Standardize your git workflow by applying consistent feat/, fix/, and chore/ branch naming patterns alongside conventional commit formatting, ensuring a scannable and automatable repository history for your team.

What is the best way to manage pull requests and avoid unsafe force pushes?▼

Manage pull requests safely by enforcing specific merge, squash, and rebase strategies while applying safe force-push rules to protect shared branch history and prevent accidental data loss during collaborative development.

How do I create a feature branch that aligns with team repository hygiene standards?▼

Create a feature branch using standardized naming patterns like feat/ to maintain repository hygiene, making the repository structure immediately understandable and ensuring your local workflow aligns with team standards.

When do I need to squash or rebase commits before opening a pull request?▼

Squash or rebase commits before opening a pull request when you need to clean up messy local history, applying safe rewrite rules to ensure your changes are easy to review and merge without disrupting shared branches.

Does this git workflow standardization work for individual projects as well as team repositories?▼

Git workflow standardization works for both individual and team projects, enforcing readable and recoverable repository history by applying consistent commit formatting and safe local history rewriting practices across all common Git tasks.

Why does inconsistent git history cause friction during code reviews?▼

Inconsistent git history causes code review friction by creating unreadable commit logs and confusing branch structures, which makes tracking changes difficult and increases the risk of overwriting teammates' work during collaboration.

Related Skills

Explore More Software Engineering Skills→
pradeepmoulipradeepmouli
2

speckit-git-initialize

Initialize a Git repository with configurable branch and .gitignore settings.

Community
Intermediate
haJ1thaJ1t

auto-changelog

Generate CHANGELOG.md from git commit history using Conventional Commits.

Community
Advanced
owenlamontowenlamont
1

python-lint-format

Automate Python code linting and formatting with pre-commit hooks.

Community
Advanced
SoufianouassifSoufianouassif

pnpm-workspace

Document pnpm monorepo workspace layout and TypeScript project references.

Community
Intermediate