GIT Workflow
Git operations: commits, branches, PRs, and conflict resolution
Install
npx skills add vstorm-co/pydantic-deepagents --skill git-workflow -g -a claude-code -y- Repository
- vstorm-co/pydantic-deepagents1.1k
- Category
- Git and review
- Updated
- 5d ago
- License
- MIT
- Context cost
- Lightabout 232 tokens
- Runs scripts
- No, instructions only
What it does
Git operations: commits, branches, PRs, and conflict resolution
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 origingit 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 diffbefore committing - Use
git stashbefore switching branches with uncommitted changes
