gitworkflow
Reference for git branching strategies, commit conventions, merge vs rebase, and conflict resolution. USE WHEN choosing a branching model, resolving conflicts, or setting commit conventions. NOT FOR running gh repo operations like push/PR/release (use GitHubOps).
소스 정보
- 저장소
- RohiRIK/skills
- 최근 소스 활동
- 2026년 10월 15일 06:07
- 감지된 SKILL.md 언어
- 영어
- 스타
- 1
- 포크
- 1
설치 방법
기본적으로 소스를 먼저 확인하는 Prompt가 선택됩니다. 직접 명령으로 전환하거나 로컬 사본을 다운로드할 수도 있습니다.
소스 파일 검토
설치 여부를 결정하기 전에 SKILL.md와 SkillsMP에 표시된 보조 파일을 읽어 보세요.
파일 탐색기
7 개 파일SKILL.md 표시 중
SKILL.md
소스 지침 · 읽기 전용 미리보기- name
- GitWorkflow
- description
- Reference for git branching strategies, commit conventions, merge vs rebase, and conflict resolution. USE WHEN choosing a branching model, resolving conflicts, or setting commit conventions. NOT FOR running gh repo operations like push/PR/release (use GitHubOps).
- category
- reference
- effort
- low
- domain
- dev
- tuned-for
- claude-5.5
- tuned-on
- 2026-10-14T00:00:00.000Z
# Git Workflow Patterns
Best practices for Git version control, branching strategies, and collaborative development. Load only the reference file the task needs.
## Reference Map
| Topic | Load when you need… | File |
|-------|--------------------|------|
| Branching | GitHub Flow vs trunk-based vs GitFlow, branch naming, cleanup, stash | `References/Branching.md` |
| Commits | Conventional Commits types, good/bad examples, `.gitmessage` template | `References/Commits.md` |
| Merge vs Rebase | When to merge vs rebase, rebase workflow, conflict resolution | `References/MergeRebase.md` |
| Pull Requests | PR title/description templates, review checklists | `References/PullRequests.md` |
| Releases | SemVer, tags, changelog generation | `References/Releases.md` |
| Config & Workflows | Git config, aliases, gitignore patterns, git hooks, common workflows, undoing mistakes, anti-patterns | `References/ConfigAndWorkflows.md` |
## Choosing a Branching Strategy
| Strategy | Team Size | Release Cadence | Best For |
|----------|-----------|-----------------|----------|
| GitHub Flow | Any | Continuous | SaaS, web apps, startups |
| Trunk-Based | 5+ experienced | Multiple/day | High-velocity teams, feature flags |
| GitFlow | 10+ | Scheduled | Enterprise, regulated industries |
## Quick Reference
| Task | Command |
|------|---------|
| Create branch | `git checkout -b feature/name` |
| Rebase branch | `git rebase main` |
| View history | `git log --oneline --graph` |
| Stash | `git stash push -m "message"` |
| Undo last commit | `git reset --soft HEAD~1` |
| Revert commit | `git revert HEAD` |
## Gotchas
- Rebase rewrites history — never rebase a branch others have already pulled; merge instead.
- A conflict resolution that just picks one side without reading both usually drops real work — read both hunks before resolving.
## Examples
**Example 1: Pick a branching model**
```
User: "what branching strategy for a small team?"
→ References/Branching.md → trunk-based vs GitHub-flow tradeoffs
```
**Example 2: Resolve a conflict**
```
User: "rebase conflict on a shared branch"
→ References/MergeRebase.md → read both hunks, resolve, merge not rebase shared history
```
GitHub에서 보기