How do I install the Git Workflow skill?

Run npx skillmds@latest add tomevault-io/git-workflow-21 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.

Is Git Workflow safe to use?

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.

Which AI agents work with Git Workflow?

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.

Is Git Workflow free to use?

Yes. Installing skills from SkillMD is free, and the skill stays under its author's original license.

Who published Git Workflow?

tomevault-io (@tomevault-io) published this skill. Their other Agent Skills are listed on their SkillMD profile.

Git Workflow by tomevault-io — Agent Skill

Name: Git Workflow
Author: tomevault-io

File contents

Git Workflow Skill

You are an expert in Git workflows and collaborative version control. Follow these conventions.

Branching Strategy

Main Branches

main or master: Production-ready code
develop: Integration branch for features

Feature Branches

feature/<ticket-id>-short-description
fix/<ticket-id>-short-description
hotfix/<ticket-id>-short-description

Branch Naming Examples

feature/ABC-123-user-authentication
fix/DEF-456-login-bug
hotfix/GHI-789-security-patch

Commit Conventions

Commit Message Format

<type>(<scope>): <subject>

<body>

<footer>

Types

feat: New feature
fix: Bug fix
docs: Documentation
style: Formatting (no code change)
refactor: Code restructuring
test: Adding tests
chore: Maintenance tasks

Examples

feat(auth): add OAuth2 login support

Implemented Google and GitHub OAuth2 authentication.
- Added auth provider configuration
- Updated user model with oauth fields
- Created login flow handlers

Closes ABC-123

Merging Strategies

Merge vs Rebase

Merge: Preserves history, use for shared branches
Rebase: Clean linear history, use for local cleanup before merge

Pull Request Workflow

Create feature branch from develop
Make commits with clear messages
Push and open PR
Request reviews
Address feedback
Squash and merge

Conflict Resolution

Before Resolving

git fetch origin
git checkout feature-branch
git merge origin/develop

Resolving Conflicts

Identify conflicting files
Review both versions
Choose or combine changes
Mark as resolved: git add <file>
Complete merge: git commit

Best Practices

Communicate with team members
Take context into account
Test after resolution
Don't rush - understand both sides

Useful Commands

Stash Changes

git stash
git stash pop
git stash list

Interactive Rebase

git rebase -i HEAD~3

Bisect for Bugs

git bisect start
git bisect bad
git bisect good <commit>

Hooks

Pre-commit

Run linters
Check code formatting
Run fast tests

Commit-msg

Validate commit message format
Check ticket ID presence

Source: crochee/synthia — distributed by TomeVault.

---name: git-workflow-21description: Use when branching, committing, resolving merge conflicts, or following collaborative git conventions---# Git Workflow SkillYou are an expert in Git workflows and collaborative version control. Follow these conventions.## Branching Strategy### Main Branches- `main` or `master`: Production-ready code- `develop`: Integration branch for features### Feature Branches```feature/<ticket-id>-short-descriptionfix/<ticket-id>-short-descriptionhotfix/<ticket-id>-short-description```### Branch Naming Examples```feature/ABC-123-user-authenticationfix/DEF-456-login-bughotfix/GHI-789-security-patch```## Commit Conventions### Commit Message Format```<type>(<scope>): <subject><body><footer>```### Types- `feat`: New feature- `fix`: Bug fix- `docs`: Documentation- `style`: Formatting (no code change)- `refactor`: Code restructuring- `test`: Adding tests- `chore`: Maintenance tasks### Examples```feat(auth): add OAuth2 login supportImplemented Google and GitHub OAuth2 authentication.- Added auth provider configuration- Updated user model with oauth fields- Created login flow handlersCloses ABC-123```## Merging Strategies### Merge vs Rebase- **Merge**: Preserves history, use for shared branches- **Rebase**: Clean linear history, use for local cleanup before merge### Pull Request Workflow1. Create feature branch from `develop`2. Make commits with clear messages3. Push and open PR4. Request reviews5. Address feedback6. Squash and merge## Conflict Resolution### Before Resolving```bashgit fetch origingit checkout feature-branchgit merge origin/develop```### Resolving Conflicts1. Identify conflicting files2. Review both versions3. Choose or combine changes4. Mark as resolved: `git add <file>`5. Complete merge: `git commit`### Best Practices- Communicate with team members- Take context into account- Test after resolution- Don't rush - understand both sides## Useful Commands### Stash Changes```bashgit stashgit stash popgit stash list```### Interactive Rebase```bashgit rebase -i HEAD~3```### Bisect for Bugs```bashgit bisect startgit bisect badgit bisect good <commit>```## Hooks### Pre-commit- Run linters- Check code formatting- Run fast tests### Commit-msg- Validate commit message format- Check ticket ID presence---> Source: [crochee/synthia](https://github.com/crochee/synthia) — distributed by [TomeVault](https://tomevault.io).

Frequently asked questions

Git Workflow