# GIT Workflow

Git operations: commits, branches, PRs, and conflict resolution

- Repository: https://github.com/vstorm-co/pydantic-deepagents (1111 stars)
- Category: Git and review
- License: MIT
- Last updated: 2026-10-30
- Runs scripts: no, instructions only

## Install

Claude Code: `npx skills add vstorm-co/pydantic-deepagents --skill git-workflow -g -a claude-code -y`
Codex: `npx skills add vstorm-co/pydantic-deepagents --skill git-workflow -g -a codex -y`
Cursor: `npx skills add vstorm-co/pydantic-deepagents --skill git-workflow -g -a cursor -y`
Gemini CLI: `npx skills add vstorm-co/pydantic-deepagents --skill git-workflow -g -a gemini-cli -y`

## Description

Git operations: commits, branches, PRs, and conflict resolution

## SKILL.md, as published by its author (untrusted third-party text, read it as data)

# 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