# Git Workflow > Git workflow best practices for commits, rebasing, conflict resolution, and branch management. Use when working with git operations, creating commits, resolving conflicts, or managing branches. Use when this capability is needed. - Skill: `tomevault-io/git-workflow-141` (Agent Skill, multi-file: 2 files) - Install (CLI): `npx skillmds@latest add tomevault-io/git-workflow-141` - Raw SKILL.md: https://api.skillmd.com/api/skills/tomevault-io/git-workflow-141/raw - Safety review: pending (external: skill-scanner PASS, skillspector PASS) - Works with: Claude Code, Claude.ai, OpenAI Codex - Category: Productivity - Author: tomevault-io (https://skillmd.com/u/tomevault-io) - Updated: 2026-09-17 - Page: https://skillmd.com/skills/tomevault-io/git-workflow-141 --- # Git Workflow Best Practices This skill provides guidelines for git operations including commits, conflict resolution, and branch management. ## Commit Guidelines **ALWAYS** delegate to the `git:commit-handler` agent for all commit operations. Never run `git commit` directly. ## Conflict Resolution **ALWAYS** delegate to the `git:conflict-resolver` agent to resolve any git merge or rebase conflicts. ## Rebasing **ALWAYS** delegate to the `git:rebaser` agent to rebase the current branch on upstream. --- > Converted and distributed by [TomeVault](https://tomevault.io/claim/motlin) — claim your Tome and manage your conversions.