git-workflow

Designs git workflows covering branching strategies, trunk-based development, stacked changes, conventional commits, CI/CD pipelines, and repository hygiene. Use when setting up branching models, writing commit messages, configuring GitHub Actions, managing stacked PRs, cleaning stale branches, creating issue templates, or recovering lost commits.

Ir para a instalação

Repositório: oakoss/agent-skills
Última atividade na origem: 24 de fevereiro de 2026 às 20:28
Idioma detectado do SKILL.md: inglês
Estrelas: 14
Forks: 5

Opções de instalação

Por padrão, está selecionado o prompt que primeiro revisa a origem. Você pode mudar para um comando direto ou baixar uma cópia local.

Instalar com Codex ou Claude Copie este prompt, cole no Codex, Claude ou outro assistente e deixe que ele revise a página da skill e instale para você.

Um comando direto ignora o prompt de revisão. Verifique a origem antes de executá-lo.

npx skills add https://github.com/oakoss/agent-skills --skill git-workflow

O comando permanece em uma só linha. Role horizontalmente para revisá-lo antes de copiar.

Prefere uma cópia local? Baixe os arquivos disponíveis atualmente no SkillsMP.

Revise os arquivos de origem

Leia o SKILL.md e os arquivos complementares exibidos pelo SkillsMP antes de decidir se vai instalar.

Explorador de arquivos

10 arquivos

SKILL.md

Instruções da origem · Visualização somente leitura

Voltar à pesquisa Voltar à instalação

Type	Purpose	Version Bump
`feat`	New features	Minor
`fix`	Bug fixes	Patch
`docs`	Documentation only	None
`style`	Formatting, no logic changes	None
`refactor`	Neither fix nor feature	None
`perf`	Performance improvements	Patch
`test`	Adding or correcting tests	None
`build`	Build system or external dependencies	None
`ci`	CI configuration changes	None
`chore`	Tooling, maintenance, non-src changes	None
`revert`	Revert a previous commit	Varies

Issue	Resolution
Merge conflicts on long-running branch	Rebase onto main frequently; break remaining work into new branch if over 48 hours
Broken main branch	Treat as emergency; revert offending commit, then fix forward on a branch
Lost commits or data recovery	Use git reflog and object inspection (`git cat-file`, `git fsck`)
CI pipeline failures	Check reusable workflow versions; verify OIDC permissions
Stacked PR conflicts after rebase	Restack entire chain from base; Graphite handles automatically with `gt restack`
Large file accidentally committed	Use `git filter-repo` to remove from history (not `git filter-branch`)

Mistake	Correct Pattern
Keeping feature branches alive longer than 48 hours	Merge or rebase daily; break large work into stacked PRs
Committing directly to main without branch protection	Enable branch protection rules requiring CI and review
Using merge commits that clutter history	Rebase and squash to maintain linear history
Hardcoding tokens in GitHub Actions workflows	Use OIDC Connect for authentication in CI/CD pipelines
Creating monolithic CI workflows in a single file	Split into reusable workflows and composite actions
`Fix bug` as commit message	`fix(scope): correct bug description` (conventional)
`feat: Added feature` (past tense)	`feat: add feature` (imperative mood, lowercase)
Using `git filter-branch` for history rewriting	Use `git filter-repo` (faster, safer, officially recommended)
Pushing to main directly	Create feature branch first
Unsigned commits in shared repositories	Configure commit signing with SSH or GPG keys

name	git-workflow
description	Designs git workflows covering branching strategies, trunk-based development, stacked changes, conventional commits, CI/CD pipelines, and repository hygiene. Use when setting up branching models, writing commit messages, configuring GitHub Actions, managing stacked PRs, cleaning stale branches, creating issue templates, or recovering lost commits.
license	MIT
metadata	{"author":"oakoss","version":"1.1"}
user-invocable	false

Area	Key Practice
Branching	Trunk-based development with short-lived feature branches
Commits	Conventional commits with imperative mood
History	Linear history via rebase; squash noisy commits
PRs	Small, stacked changes; no mega PRs

name	git-workflow
description	Designs git workflows covering branching strategies, trunk-based development, stacked changes, conventional commits, CI/CD pipelines, and repository hygiene. Use when setting up branching models, writing commit messages, configuring GitHub Actions, managing stacked PRs, cleaning stale branches, creating issue templates, or recovering lost commits.
license	MIT
metadata	{"author":"oakoss","version":"1.1"}
user-invocable	false

Area	Key Practice
Branching	Trunk-based development with short-lived feature branches
Commits	Conventional commits with imperative mood
History	Linear history via rebase; squash noisy commits
PRs	Small, stacked changes; no mega PRs

git-workflow

Opções de instalação

Revise os arquivos de origem

Git Workflow

Quick Reference

Git Workflow

Quick Reference

Branch Naming

Conventional Commit Types

Pre-Merge Checks

Troubleshooting

Common Mistakes

Delegation

References

Type	Use For	Example
feat	New features	`feat/add-user-auth`
fix	Bug fixes	`fix/login-redirect`
chore	Maintenance	`chore/update-deps`
docs	Documentation	`docs/api-reference`
refactor	Code restructuring	`refactor/auth-module`

git-workflow

Informações da origem

Opções de instalação

Revise os arquivos de origem

Mais deste repositório

Mais deste repositório

Git Workflow

Quick Reference

Git Workflow

Quick Reference

Branch Naming

Conventional Commit Types

Pre-Merge Checks

Troubleshooting

Common Mistakes

Delegation

References