skills.rest
riftzen-bit
riftzen-bitCOMMUNITY
Explore all skills by this author →
GitHub

git-workflow

Standardize Git workflows with branching strategies, commit conventions, and release management.

1|Updated Apr 7, 2026
Search Tags:#git#workflow#branching#commits#release-management#conflict-resolution#pull-requests
One-click install
npx skills add https://github.com/riftzen-bit/gemini-setup --skill git-workflow-riftzen-bit
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/riftzen-bit/gemini-setup/tree/main/skills/git-workflow
Command: npx skills add https://github.com/riftzen-bit/gemini-setup --skill git-workflow-riftzen-bit

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Helps teams standardize Git practices, reduce merge conflicts, keep a clear commit history, and streamline releases so collaboration scales without chaos.

Core Features & Use Cases

  • Branching Strategy Guidance: Recommendations for GitHub Flow, Trunk-Based Development, and GitFlow with when to use each.
  • Commit & PR Conventions: Conventional commits format, commit message template, PR title/description templates, and reviewer checklists.
  • Merge vs Rebase & Conflict Resolution: When to merge, when to rebase, step-by-step conflict resolution, and conflict prevention strategies.
  • Release and Tagging Practices: Semantic versioning, creating annotated tags, and changelog generation workflows.
  • Use Case: Onboard new engineers and enforce consistent workflows across multiple repositories to accelerate safe deployments and simplify code review.

Quick Start

Create a branching strategy, add a commit message template, and enforce PR checks to establish consistent Git workflows across your repository.

Frequently Asked Questions about git-workflow

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

FAQPage Schema
What is the best Git branching strategy for my team's release management?▼

Git branching strategy selection depends on team size and release cadence. This workflow provides guidance on choosing between GitHub Flow, Trunk-Based Development, and GitFlow to standardize project setup and streamline safe deployments.

How do I write conventional commit messages and standardize pull request conventions?▼

You can enforce consistent commit and pull request conventions by applying conventional commit formats, commit message templates, PR title and description templates, and reviewer checklists to maintain a clear project history.

When should I merge vs rebase to prevent merge conflicts in Git?▼

Merge versus rebase guidance depends on your branching model and history requirements. This workflow outlines when to merge, when to rebase, and step-by-step conflict resolution procedures to prevent integration chaos.

How do I manage semantic versioning and generate changelogs from Git tags?▼

Release and tagging practices involve applying semantic versioning, creating annotated Git tags, and executing changelog generation workflows to standardize release management across multiple repositories.

Can I use these Git workflow conventions to onboard new engineers across multiple repositories?▼

Yes, you can onboard new engineers and enforce consistent workflows across multiple repositories. This standardization accelerates safe deployments, simplifies code review, and reduces collaboration issues in version control.

Related Skills

Explore More Software Engineering Skills→
Tx1207Tx1207
5

project-creator

Create a new project from a template, initialize uv, and configure a local Git repository.

Community
Advanced
AndrewDrygaAndrewDryga
28

release

Create semantic version tags from changelogs and push them to Git.

Community
Advanced
liumeixinliumeixin
4

requesting-code-review

Automate code review with static analysis and an independent reviewer subagent.

Community
Advanced
ragnarok22ragnarok22
5

release

Automate version bumping, release notes, tests, Git tagging, and GitHub releases.

Community
Advanced