Skip to content
Development
Skill

/git-workflow

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

From plugin
pydantic-deepagents
1.1k14 skills

Claude Code

$ npx -y skills add vstorm-co/pydantic-deepagents --skill git-workflow --agent claude-code

SKILL.md

git-workflow.SKILL.md
name: git-workflow
description: "Git operations: commits, branches, PRs, and conflict resolution"
tags: [git, workflow]
version: "1.0.0"

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
@vstorm-co
Ships withpydantic-deepagents

Open-source, self-hosted Claude Code - a terminal AI assistant and the Python framework behind it. Tool-calling, sandboxed execution, multi-agent teams, skills, checkpoints, unlimited context - on Pydantic AI, any model.

Stars on GitHub

Momentum

stars in total
1.1k
Star history of vstorm-co/pydantic-deepagents on GitHub, a chart by star-history.com

Other skills on pydantic-deepagents.

More skills from other plugins.

brainstorming
Auto-invoked

brainstorming

You MUST use this before any creative work - creating features, building components, adding functionality, modifying behavior, or…

@obra@obraInstall Skill
ask-matt

ask-matt

Ask which skill or flow fits your situation. A router over the skills in this repo.

skills2w309k
@mattpocock@mattpocockInstall Skill
accessibility
Auto-invoked

accessibility

Design, implement, and audit accessible UI to WCAG 2.2 Level AA across Web, iOS, and Android — semantic ARIA roles and labels,…

ecc2w293k
@affaan-m@affaan-mInstall Skill
compiler-commit

compiler-commit

Use when you want to verify compiler changes and commit with the correct convention. Runs tests, lint, and format, then commits…

react5d252k
@facebook@facebookInstall Skill

Questions about git-workflow.

Which coding agents can use git-workflow?
git-workflow installs in Claude Code, Codex, Cursor, Gemini CLI, GitHub Copilot, OpenCode and Windsurf with the skills CLI, using each agent's flag shown on this page. Flowy's auto-invocation, which fires a skill when your prompt matches, runs in Claude Code only.