---
name: Git Workflow
slug: git-workflow-2
category: DevOps
description: Git Workflow covers commit formatting, branching, pull requests, and conflict resolution. Use it when working through standard Git changes safely in a team setting.
github: "https://github.com/vstorm-co/pydantic-deepagents/tree/main/pydantic_deep/bundled_skills/git-workflow"
language: Python
stars: 1037
forks: 126
install: "npx degit https://github.com/vstorm-co/pydantic-deepagents/tree/main/pydantic_deep/bundled_skills/git-workflow ~/.claude/skills/git-workflow"
installs_to: ~/.claude/skills/git-workflow
source_path: pydantic_deep/bundled_skills/git-workflow/SKILL.md
collection_size: 14
category_size: 798
collection_url: "https://dirskills.com/collections/vstorm-co/pydantic-deepagents"
added: 2026-08-21T05:14:09.853Z
last_synced: 2026-08-21T05:14:09.853Z
canonical_url: "https://dirskills.com/skills/git-workflow-2"
---

# Git Workflow

Git Workflow covers commit formatting, branching, pull requests, and conflict resolution. Use it when working through standard Git changes safely in a team setting.

**Install:**

```bash
npx degit https://github.com/vstorm-co/pydantic-deepagents/tree/main/pydantic_deep/bundled_skills/git-workflow ~/.claude/skills/git-workflow
```

## README

# 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