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
Converted and distributed by TomeVault — claim your Tome and manage your conversions.
1---2name: vstorm-co-pydantic-deepagents-git-workflow3description: Git Workflow4---56# Git Workflow78## Commit Messages910Format: `<type>: <description>`1112Types: feat, fix, refactor, test, docs, style, chore1314- Description starts with lowercase verb15- Max 72 characters for first line16- Add body for complex changes1718## Branch Workflow19201. Create feature branch from main: `git checkout -b feat/description`212. Make changes in small, focused commits223. Push and create PR234. After review, squash-merge to main2425## Conflict Resolution26271. `git fetch origin`282. `git rebase origin/main` (or merge if team prefers)293. For each conflict:30 - Read both versions carefully31 - Understand the intent of each change32 - Resolve preserving both intents33 - Test after resolving344. `git rebase --continue`3536## Safety Rules3738- Never force-push to main/master39- Never commit secrets, credentials, or .env files40- Always check `git diff` before committing41- Use `git stash` before switching branches with uncommitted changes4243---44> Converted and distributed by [TomeVault](https://tomevault.io/claim/vstorm-co) — claim your Tome and manage your conversions.45<!-- tomevault:4.0:skill_md:2026-04-16 -->
Run npx skillmds@latest add tomevault-io/vstorm-co-pydantic-deepagents-git-workflow in your terminal (requires Node.js), paste this page's agent-chat prompt into Claude, Cursor, or any MCP-connected agent, or download the SKILL.md file and copy it into your agent's skills directory.
Git Workflow It is listed under Productivity on SkillMD.
This skill has not completed SkillMD's automated safety review yet. Independent scanners report: SkillSpector: PASS, Skill Scanner: PASS. SkillMD never runs a skill's scripts for you; review the SKILL.md before installing.
This skill is tagged as working with Claude Code, Claude.ai, OpenAI Codex. SKILL.md is an open format, so most agents that read a skills directory can load it too.
Yes. Installing skills from SkillMD is free, and the skill stays under its author's original license.
tomevault-io (@tomevault-io) published this skill. Their other Agent Skills are listed on their SkillMD profile.