Git Workflow

This is a comprehensive Git workflow reference that implements Conventional Commits, branch management strategies, and team collaboration standards. It covers the full development lifecycle from feature branches through hotfixes and releases, with specific examples for merge vs rebase decisions and conflict resolution. The skill includes detailed commit type references, branch naming conventions, and protection rules for master and develop branches. What stands out is the opinionated approach: it mandates no-ff merges for feature branches to preserve history, recommends rebase for syncing but merge for integration, and provides complete workflow commands you can actually copy and run. If your team debates whether to rebase or merge, or you're tired of inconsistent commit messages, this gives you a ready-made standard to adopt.

skills.sh installs: 382
GitHub stars: 6K
last updated: Aug 21, 2026

View on GitHub

Install

$ npx -y skills add galaxy-dawn/claude-scholar --skill git-workflow --agent claude-code

Installs into .claude/skills of the current project.

Files

Git Workflow Standards

This document defines the project's Git usage standards, including commit message format, branch management strategy, workflows, merge strategies, and more. Following these standards improves collaboration efficiency, enables traceability, supports automation, and reduces conflicts.

Commit Message Standards

The project follows the Conventional Commits specification:

<type>(<scope>): <subject>

<body>

<footer>

Type Reference

Type	Description	Example
`feat`	New feature	`feat(user): add user export functionality`
`fix`	Bug fix	`fix(login): fix captcha not refreshing`
`docs`	Documentation update	`docs(api): update API documentation`
`refactor`	Refactoring	`refactor(utils): refactor utility functions`
`perf`	Performance improvement	`perf(list): optimize list performance`
`test`	Test related	`test(user): add unit tests`
`chore`	Other changes	`chore: update dependency versions`

Subject Rules

Start with a verb: add, fix, update, remove, optimize
No more than 50 characters
No period at the end

SKILL.md on GitHub

Details

Repository: github.com/galaxy-dawn/claude-scholar
Categories: Git & Pull Requests, Release Management, Automation & Workflows
First seen: Jun 3, 2026

gitdalestudy/skillsGit 버전 관리 모범 관례 및 워크플로우 가이드. 다음 상황에서 사용: (1) Git 커밋 메시지 작성 시 (Conventional Commits 규칙 적용), (2) 브랜치 생성 및 관리 시 (GitHub Flow 기반), (3) PR 생성 및 병합 전략 선택 시, (4) Git 히376skills.sh installs

github-workflow-automationdavila7/claude-code-templatesAutomate GitHub workflows with AI assistance. Includes PR reviews, issue triage, CI/CD integration, and Git operations. Use when automating GitHub workflows, se371skills.sh installs

changelog-generatordavila7/claude-code-templatesAutomatically creates user-facing changelogs from git commits by analyzing commit history, categorizing changes, and transforming technical commits into clear, 349skills.sh installs

git-pushingdavila7/claude-code-templatesStage, commit, and push git changes with conventional commit messages. Use when user wants to commit and push changes, mentions pushing to remote, or asks to sa346skills.sh installs

git-advancedgeoffjay/claude-pluginsAdvanced git operations including complex rebase strategies, interactive staging, commit surgery, and history manipulation. Use when user needs to perform compl324skills.sh installs

gitlabodyssey4me/agent-skillsCreate and manage GitLab issues, merge requests, pipelines, and repositories using the glab CLI. Use when asked to open an MR, review a merge request, check CI/303skills.sh installs