Skill860 repo starsupdated today

git-workflow

The git-workflow skill provides standardized procedures for managing commits, branches, pull requests, and conflict resolution within development teams. It enforces commit message formatting with specific types (feat, fix, refactor, test, docs, style, chore), establishes a feature-branch workflow with squash-merge integration, details step-by-step conflict resolution using rebase or merge strategies, and outlines safety rules preventing force-pushes to main branches and credential exposure. Use this skill when implementing or maintaining consistent git practices across collaborative projects.

View source Repository: pydantic-deepagents

Install in Claude Code

Copy

git clone --depth 1 https://github.com/vstorm-co/pydantic-deepagents /tmp/git-workflow && cp -r /tmp/git-workflow/pydantic_deep/bundled_skills/git-workflow ~/.claude/skills/git-workflow

Then start a new Claude Code session; the skill loads automatically.

Definition

SKILL.md

# Git Workflow

## Commit Messages

Format: `<type>: <description>`

Types: feat, fix, refactor, test, docs, style, chore

- Description starts with lowercase verb
- Max 72 characters for first line
- Add body for complex changes

## Branch Workflow

1. Create feature branch from main: `git checkout -b feat/description`
2. Make changes in small, focused commits
3. Push and create PR
4. After review, squash-merge to main

## Conflict Resolution

1. `git fetch origin`
2. `git rebase origin/main` (or merge if team prefers)
3. For each conflict:
   - Read both versions carefully
   - Understand the intent of each change
   - Resolve preserving both intents
   - Test after resolving
4. `git rebase --continue`

## Safety Rules

- Never force-push to main/master
- Never commit secrets, credentials, or .env files
- Always check `git diff` before committing
- Use `git stash` before switching branches with uncommitted changes