skills.rest
TeiNam
TeiNamCOMMUNITY
Explore all skills by this author →
WebsiteGitHub

git-workflow

Implement Git branching strategies, commit conventions, and pull request workflows.

12|4|Updated Mar 22, 2026
Search Tags:#git#version control#branching#team collaboration#workflows
One-click install
npx skills add https://github.com/TeiNam/kiro-with-harness --skill git-workflow-teinam
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/TeiNam/kiro-with-harness/tree/main/skills/git-workflow
Command: npx skills add https://github.com/TeiNam/kiro-with-harness --skill git-workflow-teinam

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) and references (resource) components.

What problem does it solve?

This Skill helps teams implement and maintain efficient Git workflows with a focus on best practices and common branching strategies, improving collaboration and version control efficiency.

Core Features & Use Cases

  • Branching Strategies: Guides on implementing GitHub Flow, Trunk-Based Development, and GitFlow, tailored to team size and release cycles.
  • Commit Conventions: Provides guidance on conventional commit messages and templates for clean commit history.
  • Merge vs. Rebase: Offers instructions on choosing between merge and rebase to maintain linear or detailed commit history.
  • Pull Request Workflow: Explains the PR title and description format, code review checklists, and conflict resolution steps.
  • Release Management: Discusses semantic versioning and steps to create, push, and manage tags.
  • Git Configuration: Essential configurations and aliases for improved Git efficiency.
  • Common Workflows: Templates for starting a feature, updating PRs, syncing forks, undoing mistakes, and managing hotfixes.

Quick Start

Activate the skill and provide the task you want to execute, such as 'show branching strategies' or 'how to resolve merge conflicts'.

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 workflow for my team's release cycle?▼

Git workflows like GitHub Flow, Trunk-Based Development, and GitFlow suit different release cycles. Choosing the right branching strategy improves team collaboration and version control efficiency based on your team size.

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

To resolve merge conflicts during a pull request, follow standard conflict resolution steps to reconcile differences. This pull request workflow ensures clean integration of feature branches into the main codebase.

How do I write conventional commit messages for a clean history?▼

Write conventional commit messages by applying specific templates and formats. This commit convention practice ensures a clean commit history, making version control easier to track and manage.

When should I choose merge vs rebase in Git?▼

Choose merge vs rebase based on your desired commit history. Rebase maintains a linear history, while merge preserves a detailed timeline of changes, guiding your team collaboration strategy.

Do I need prior Git knowledge to implement these branching patterns?▼

Yes, you need familiarity with basic Git commands and concepts. Implementing branching patterns and release management assumes existing version control knowledge to effectively streamline team workflows.

How do I manage semantic versioning and tags for releases?▼

Manage semantic versioning by creating, pushing, and managing Git tags. This release management process tracks software versions systematically and coordinates deployment strategies across team collaboration workflows.

Related Skills

Explore More Software Engineering Skills→
MMXCMMXC

git-essentials

Provide essential Git commands for version control, branching, and collaboration.

Community
Intermediate
ruifrvazruifrvaz
3

smaqit.release-approval

Validate release version approval via pattern matching or user confirmation.

Community
Intermediate
jal-cojal-co
35

git

Guide Git and GitHub CLI operations for version control and pull requests.

Community
Advanced
EmmraanEmmraan

unified-version-control-and-source-code-management

Manage Git repositories with branching strategies, commit conventions, and CI/CD integration.

Community
Advanced