skills.rest
jnPiyush
jnPiyushCOMMUNITY
Explore all skills by this author →
GitHub

version-control

Standardize Git workflows with conventional commits and branch naming rules.

Updated Jan 23, 2026
Search Tags:#git#workflow#branching#pull-request#version-control#merge-conflicts#conventional-commits
One-click install
npx skills add https://github.com/jnPiyush/AI-Squad --skill version-control-jnpiyush
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: version-control
Source: https://github.com/jnPiyush/AI-Squad/tree/main/ai_squad/skills/version-control
Command: npx skills add https://github.com/jnPiyush/AI-Squad --skill version-control-jnpiyush

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill standardizes Git workflows to improve collaboration and code quality across teams by providing clear conventions for commits, branching, PRs, and merge conflict handling.

Core Features & Use Cases

  • Commit conventions: Enforce conventional commits (feat, fix, docs, style, refactor, test, chore, perf, ci, build) with practical examples.
  • Branching strategies: Guidance on main/develop branches, feature/bugfix branches, release branches, and strategies for rebasing and squashing.
  • PR and merge discipline: Best practices for pull requests, code reviews, and smooth merge processes to maintain a clean project history.
  • Use Case: A team works on a feature branch, follows conventional commits, opens a PR to develop, and applies rebase and squash before merging.

Quick Start

Initialize a repository or clone an existing project, create a feature branch, make changes, commit with conventional messages, push, and open a PR following the guidelines.

Frequently Asked Questions about version-control

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

FAQPage Schema
How do I enforce conventional commits in my Git workflow?▼

Standardize Git workflow conventional commits by applying prefixes like feat, fix, docs, style, refactor, test, chore, perf, ci, and build to structure commit messages. This standardization improves collaboration and keeps project history clean.

What is the best way to structure Git branches for feature and bugfix work?▼

Structure Git branches for feature and bugfix work by using main or develop branches as the base, creating dedicated feature and bugfix branches, and utilizing release branches to ensure smooth merges and standardized development.

How do I handle merge conflicts during a pull request?▼

Handle pull request merge conflicts by applying standard rebase and squash techniques before merging. A disciplined PR process with code reviews ensures smooth conflict resolution and maintains a clean project history.

When should I use rebase and squash before merging a pull request?▼

Use rebase and squash before merging a pull request when you need to consolidate multiple feature branch commits into a single clean commit. This maintains a linear project history and simplifies code reviews.

Does this Git workflow standardization work for typical software projects?▼

Yes, this Git workflow standardization applies to typical software projects, covering feature and bugfix work, PR processes, rebasing, squashing, and conflict resolution to improve collaboration and code quality across teams.

Related Skills

Explore More Software Engineering Skills→
kamalsroor1kamalsroor1

speckit-git-initialize

Initialize a Git repository with an initial commit when none exists.

Community
Intermediate
OGismatulinOGismatulin

squash-merge

Validate and squash-merge pull requests into main branches with GitHub CLI.

Community
Advanced
DGouronDGouron
41

commit

Enforce quality gates and conventional commit rules in Git workflows.

Community
Advanced
richardadonnellrichardadonnell
45

semantic-versioning

Automate semantic versioning and changelog generation from conventional commits.

Community
Advanced