Can this skill help me resolve merge conflicts?

Yes, it provides a structured 5-step process for fetching main, identifying conflicts in files, and safely completing the merge or rebase.

Does it detect my project's existing Git rules?

Yes, it automatically scans for CONTRIBUTING.md files to identify your project's specific workflow before suggesting changes.

How does it help with branch naming?

The skill enforces a / format, providing specific prefixes like feature/, fix/, hotfix/, and refactor/ to keep your repository organized.

Which Git branching strategies does this skill support?

It supports Trunk-Based Development for high-frequency deployment, GitHub Flow for weekly cycles, and GitFlow for longer release schedules.

Git Workflow Guide (zh-TW)

Name: Git Workflow Guide (zh-TW)
Author: AsiaOstrich

byAsiaOstrich

•

Developer Tools

Guides developers through standardized Git branching strategies, naming conventions, and merge operations in Traditional Chinese.

The Git Workflow Guide skill provides Claude with domain-specific knowledge to manage version control processes effectively. It assists users in selecting the optimal branching strategy—such as Trunk-Based Development, GitHub Flow, or GitFlow—based on deployment frequency. By enforcing standardized naming conventions (e.g., feature/, fix/, refactor/) and providing step-by-step instructions for branch synchronization, PR creation, and conflict resolution, this skill ensures a clean, professional, and maintainable repository history for teams following universal development standards.

Key Features

01Standardized branch naming conventions with prefix enforcement

0240 GitHub stars

03Localized documentation and instructions in Traditional Chinese

04Project-specific configuration detection via CONTRIBUTING.md

05Strategic workflow selection guidance (Trunk-Based, GitHub Flow, GitFlow)

06Detailed step-by-step merge conflict resolution workflows

Use Cases

01Standardizing Git practices across a multilingual development team

02Resolving complex merge conflicts while maintaining a clean commit history

03Onboarding new developers to a project's specific branching and merging rules

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add asiaostrich/universal-dev-standards git-workflow-guide

For use in Claude.ai and ChatGPT

Download Skill