skills.rest
korwlik23
korwlik23COMMUNITY
Explore all skills by this author →
WebsiteGitHub

git-workflow

Define Git branching, commit, PR, and release workflows.

Updated May 6, 2026
Search Tags:#git#changelog#release management#conventional commits#pull requests#merge conflicts#branching strategy
One-click install
npx skills add https://github.com/korwlik23/skills --skill git-workflow-korwlik23
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/korwlik23/skills/tree/main/v1/git-workflow
Command: npx skills add https://github.com/korwlik23/skills --skill git-workflow-korwlik23

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Git branching and collaboration breakdowns cause lost work, messy history, broken releases, and time-consuming merge conflicts that stall delivery.

Core Features & Use Cases

  • Branching & Release Strategy: Choose and apply the right workflow (GitHub Flow, Git Flow, Trunk-Based) so main stays deployable while features move safely.
  • Commit & PR Conventions: Standardize Conventional Commits and PR structure to improve review efficiency and long-term maintainability.
  • Conflict Resolution & Change Recovery: Follow a disciplined conflict resolution process that avoids destructive mistakes, including safe rebase/merge guidance and undo/recovery principles.
  • Release & Changelog Operations: Use SemVer, tagging, and a structured changelog format to make releases traceable and consistent.

Quick Start

Ask: “Use git-workflow to propose a branching strategy, commit message format, PR template, and a conflict-resolution plan for my current repository changes.”

Frequently Asked Questions about git-workflow

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

FAQPage Schema
How do I choose the best Git branching strategy for my team?▼

Choosing a Git branching strategy depends on your release cadence; this workflow compares GitHub Flow, Git Flow, and Trunk-Based Development so your main branch stays deployable while features move safely.

What's the best way to resolve Git merge conflicts without losing work?▼

Resolving Git merge conflicts safely requires inspecting the repository state first; this workflow provides explicit guidance for destructive operations, rebases, and change recovery to prevent lost work.

How do conventional commits improve pull request reviews?▼

Conventional commits standardize commit messages and PR structure, making pull request reviews more efficient and long-term maintenance easier by keeping history traceable and consistent.

How do I generate a changelog and manage SemVer tagging for a release?▼

Release management uses SemVer tagging and a structured changelog format to make versioned releases traceable, ensuring consistent preparation across solo and team settings.

Can I use this Git workflow for solo development and hotfixes?▼

Yes, this Git workflow applies to day-to-day development tasks including solo feature work, hotfixes, rebases, merges, and versioned release preparation across both solo and team settings.

Related Skills

Explore More Software Engineering Skills→
ian-pascoeian-pascoe
1

git-commit

Generate conventional git commit messages and stage related file changes.

Community
Advanced
t0labt0lab
2

release

Analyze Conventional Commits to draft changelogs and create release commits and tags.

Official
Advanced
levkisslevkiss

github

Manage GitHub repositories via GitHub CLI for commits, branches, pull requests, issues, releases, and Pages deployment.

Community
Advanced
markus41markus41
18

Claude Code Git Integration

Generate commit messages, pull requests, and resolve Git merge conflicts.

Community
Advanced