Git Workflow

Community

Omar-Obando

git-workflow

Git workflow and version control skill covering branching strategies, commit conventions, merge conflict resolution, and collaborative development patterns.

Overview

Publisher	Omar-Obando
Repository	`qwen-orchestrator`
Skill name	`git-workflow`
Stars	53
Forks	13
Bundled files	Instructions only
License	MIT
Links	Skill source Repository Homepage

Markdown instructions
A SKILL.md file the model loads on demand, so it only costs tokens when a request actually matches.
Works with any LLM
AI skills are plain Markdown, not provider-specific code, so this works with GPT, Claude, Gemini, Grok, or a local model.
Self-contained
Everything the model needs lives in the instructions — no extra files to sync.
Open source
Published by Omar-Obando on GitHub. Read the source before you install it.

Installation

Install the Git Workflow AI skill in TypingMind to use it with any LLM, or drop it into another agent that reads SKILL.md.

Install in TypingMind

TypingMind installs a skill straight from its GitHub folder — it reads SKILL.md, bundles the resource files, and stores the result locally.

Open the app and go to Plugins → Skills.
Choose "Install from GitHub".
Paste the skill folder URL below and confirm.
https://github.com/Omar-Obando/qwen-orchestrator/tree/main/skills/git-workflow
Enable the skill in any chat where you want it available.

Plugins → Skills → Add skill → From GitHub URL, then paste the folder URL and press Continue.

Install in another agent

Any agent that reads the Agent Skills format can use this skill — copy the folder into that agent's skills directory.

Claude Code — .claude/skills

git clone --depth 1 https://github.com/Omar-Obando/qwen-orchestrator.git /tmp/qwen-orchestrator
mkdir -p .claude/skills
cp -r /tmp/qwen-orchestrator/skills/git-workflow .claude/skills/git-workflow

Restart Claude Code after copying so it picks up the new skill.

Use it in TypingMind

Enable Git Workflow in any TypingMind chat and the model takes it from there. Its name and description sit in the system prompt, and the moment a request matches, the model loads the full instructions itself — you never invoke it by hand, and it costs no tokens until it is actually used.

The model loads Git Workflow on its own as soon as a request matches it.

Works with any AI model

AI skills are plain Markdown instructions rather than provider-specific code, so Git Workflow is not tied to the model it was written for. Install it once in TypingMind and use it with GPT-5, Claude, Gemini, Grok, DeepSeek, Mistral, Llama, or a local model you run yourself — all on your own API keys.

Loaded only when it is needed
The system prompt carries just the name and description. The instructions are fetched on the first matching request, so an idle skill costs nothing.
Switch models mid-chat
Because the skill is instructions rather than code, changing model does not break it — the next model reads the same SKILL.md.

Skill instructions

This is the SKILL.md content the model loads. Read it before installing — a skill is instructions your model will follow.

Git Workflow Skill — Version Control Best Practices

This skill provides comprehensive git workflow guidance for team development.

Branching Strategy

Git Flow (Recommended for ERP/Enterprise)


main (production)
  │
  ├── develop (integration)
  │     │
  │     ├── feature/JIRA-123-user-auth
  │     ├── feature/JIRA-124-inventory-module
  │     └── bugfix/JIRA-125-login-error
  │
  ├── release/v1.2.0
  └── hotfix/v1.1.1

Branch Naming Convention


feature/JIRA-123-short-description
bugfix/JIRA-124-short-description
hotfix/JIRA-125-critical-fix
release/v1.2.0

Commit Convention (Conventional Commits)


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

<body>

<footer>

Types

Type	Usage
feat	New feature
fix	Bug fix
refactor	Code restructuring (no behavior change)
docs	Documentation only
test	Adding or updating tests
chore	Build, config, tooling
perf	Performance improvement
ci	CI/CD changes
style	Formatting (no logic change)

Examples


feat(auth): add JWT refresh token rotation

- Implement refresh token storage in database
- Add token rotation on every refresh
- Invalidate old tokens after rotation
- Add tests for token expiry edge cases

Closes JIRA-123


fix(inventory): correct stock calculation for negative quantities

Stock was showing incorrect values when adjusting below zero.
Now clamps to zero and logs a warning.

Fixes JIRA-125

Commit Rules

Atomic: Each commit does ONE thing
Revertible: Each commit can be safely reverted
Tested: Each commit has passing tests
Described: Subject line ≤ 72 chars, body explains WHY
No Secrets: Never commit .env, credentials, tokens

Merge Conflict Resolution

Protocol

Pull latest from develop
Rebase feature branch on develop
Resolve conflicts manually (never auto-merge)
Run full test suite after resolution
Verify no regressions
Push and create PR

Conflict Prevention

Keep feature branches small and short-lived
Pull/rebase frequently from develop
Avoid modifying the same files as other branches
Communicate with team about file ownership

Pull Request Template

markdown
## Description

[What does this PR do and why?]

## Type of Change

- [ ] Feature
- [ ] Bug fix
- [ ] Refactoring
- [ ] Documentation
- [ ] Test

## Testing

- [ ] Unit tests pass
- [ ] Integration tests pass
- [ ] Manual testing completed

## Checklist

- [ ] No secrets committed
- [ ] No unnecessary files
- [ ] Self-reviewed the code
- [ ] Documentation updated

When NOT to Use

Do NOT use this skill when:

Writing application business logic (use domain-driven skill)
Designing database schemas (use database-design skill)
Writing API endpoint implementations (use api-design skill)
Reviewing code for quality issues (use code-review skill)
Performing security audits (use security-auditor skill)
Analyzing deployment configurations (use deployment skill)
Writing SQL queries (use sql-best-practices skill)
Designing multi-page website layouts (use design-system skill)

Frequently asked questions

What does the Git Workflow AI skill do?

Git workflow and version control skill covering branching strategies, commit conventions, merge conflict resolution, and collaborative development patterns.

Why use Git Workflow on TypingMind?

Because you install it once and use it with any model. Git Workflow is plain Markdown rather than provider-specific code, so the same skill runs on GPT-5, Claude, Gemini, Grok, or a local model — and you can switch model mid-chat without it breaking. TypingMind runs on your own API keys, so you pay providers directly instead of a per-seat subscription, and your skills and chats stay in your own storage.

How do I install Git Workflow in TypingMind?

Open Plugins → Skills → Install from GitHub in TypingMind and paste https://github.com/Omar-Obando/qwen-orchestrator/tree/main/skills/git-workflow. TypingMind reads its SKILL.md and installs it as a skill you can enable per chat.

Which AI models can use Git Workflow?

Any model you connect in TypingMind. AI skills are plain Markdown instructions rather than provider-specific code, so GPT, Claude, Gemini, Grok, and local models can all load this skill when a request matches it.

How many AI models can I use with Git Workflow?

As many as you like. As long as a model supports skills, you can use Git Workflow with it — GPT, Claude, Gemini, Grok, DeepSeek, Mistral, Llama and more — all on TypingMind with your own API keys.

Is the Git Workflow AI skill free?

Yes. It is published on GitHub by Omar-Obando under the MIT license. You only pay your own AI provider for the tokens you use.

What are AI skills?

An AI skill is a reusable instruction bundle that teaches an AI model how to do one specific task. It follows the open Agent Skills format: a SKILL.md file with a name and description, plus any scripts, templates or reference files the model may need. The model reads the instructions only when your request matches the skill, so an installed skill costs nothing until it is used.

How are AI skills different from plugins or MCP servers?

A plugin or MCP server gives a model new tools to call — code that runs somewhere and returns a result. An AI skill gives the model knowledge and process instead: how to approach a task, which steps to follow, what good output looks like. Skills are plain Markdown, so they need no server, no API key and no runtime, and they work with any model.

View all

Openclaw Debugging

openclaw

OrganizationPopular

Debug OpenClaw model, provider, tool-surface, code-mode, streaming, and live/Crabbox behavior by choosing the right logs, probes, and proof path before changing code, including fetching stored…

Openclaw Live Updater

openclaw

OrganizationPopular

Maintain the canonical live OpenClaw main checkout, macOS LaunchAgent-managed Gateway, local macOS app, exact-head main CI, and recurring full release validation. Use for fast-forward update…

Openclaw Pr Maintainer

openclaw

OrganizationPopular

Review, triage, repair, or land OpenClaw issues and pull requests with current-source evidence and the native maintainer workflow.

Openclaw Refactor Docs

openclaw

OrganizationPopular

Refactor an existing OpenClaw docs page with source-audited preservation, restructuring, and verification.

Overview

Installation

Install in TypingMind

Install in another agent

Use it in TypingMind

Works with any AI model

Skill instructions

Git Workflow Skill — Version Control Best Practices

Branching Strategy

Git Flow (Recommended for ERP/Enterprise)

Branch Naming Convention

Commit Convention (Conventional Commits)

Types

Examples

Commit Rules

Merge Conflict Resolution

Protocol

Conflict Prevention

Pull Request Template

When NOT to Use

Frequently asked questions

Related AI Skills

Set up your own AI workspace now