Pydantic-deepagents git-workflow

Name: git-workflow
Author: vstorm-co

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

install

source · Clone the upstream repo

git clone https://github.com/vstorm-co/pydantic-deepagents

Claude Code · Install into ~/.claude/skills/

T=$(mktemp -d) && git clone --depth=1 https://github.com/vstorm-co/pydantic-deepagents "$T" && mkdir -p ~/.claude/skills && cp -r "$T/pydantic_deep/bundled_skills/git-workflow" ~/.claude/skills/vstorm-co-pydantic-deepagents-git-workflow-990fa3 && rm -rf "$T"

manifest: pydantic_deep/bundled_skills/git-workflow/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

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

Conflict Resolution

```
git fetch origin
```
```
git rebase origin/main
```
(or merge if team prefers)
For each conflict:
- Read both versions carefully
- Understand the intent of each change
- Resolve preserving both intents
- Test after resolving
```
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