Git Workflow Plugin¶

Professional git workflow automation with pre-commit checks, emoji conventional commits, PR management, and comprehensive references.

Version 2.2.2¶

Minor Update: Added /git-workflow:resolve-conflicts command for intelligent merge conflict resolution with semantic analysis, automated test validation, and comprehensive reference documentation.

Commands¶

`/git-workflow:commit`¶

Create professional git commits with automated pre-commit checks and emoji conventional commit format.

Features:

🎨 Emoji Conventional Commits (✨ feat, 🐛 fix, 📚 docs, etc.)
⚡ Automated pre-commit checks for Java, Python, React, and Documentation
🔍 Project type detection (Maven, Gradle, npm, pytest, etc.)
📋 Comprehensive commit message validation
🚀 Optional integration with professional-commit-workflow skill (~70% faster)
✅ Best practices enforcement
📖 Extensive reference documentation

Usage:

Bash
/git-workflow:commit                    # Standard workflow
/git-workflow:commit --no-verify        # Skip pre-commit checks
/git-workflow:commit --skip-tests       # Skip test execution
/git-workflow:commit --with-skills      # Use professional-commit-workflow skill

Pre-Commit Checks:

Java: Maven/Gradle build, Checkstyle, JUnit tests
Python: Ruff/Black formatting, pytest, mypy type checking
React/Node.js: ESLint, Prettier, TypeScript compilation, Jest/Vitest
Documentation: LaTeX compilation, Markdown linting

Supported Commit Types:

✨ feat - New features
🐛 fix - Bug fixes
📚 docs - Documentation changes
💎 style - Code formatting
♻️ refactor - Code restructuring
⚡ perf - Performance improvements
🧪 test - Testing
🔧 chore - Build/tools/config

See commit-types.md for complete list.

References: - Best Practices - Commit quality guidelines - Commit Types - Complete emoji conventional commit types - Pre-Commit Checks - Automated validation details - Troubleshooting - Common issues and solutions

`/git-workflow:create-pr`¶

Create pull requests with automated branch management, commit analysis, and professional PR descriptions.

Features:

📝 Automatic PR description generation from commits
🔍 Branch status verification and validation
💪 Related issue linking and references
⚡ Breaking changes documentation
👥 Reviewer suggestions
🎯 Test plan generation
🔄 Code formatting integration (Biome, Black, Prettier)
🚀 Optional integration with professional-pr-workflow skill

Usage:

Bash
/git-workflow:create-pr                 # Standard PR creation
/git-workflow:create-pr --no-format     # Skip code formatting
/git-workflow:create-pr --with-skills   # Use professional-pr-workflow skill

PR Description Includes:

Summary of changes from all commits (not just latest!)
Technical implementation details
Breaking changes (if any)
Related issues and references
Comprehensive test plan checklist
Generated with Claude Code attribution

References:

Code Formatting - Automatic code formatting
Commit Workflow - Commit management in PRs
PR Template - PR description structure
Troubleshooting - Common PR issues

`/git-workflow:resolve-conflicts`¶

Analyze and resolve merge conflicts intelligently with automated root cause analysis, semantic code merging, and test validation.

Features:

🔍 Automatic conflict root cause analysis with source identification
🧠 Smart strategy with semantic understanding of code changes
🔀 Three merge strategies: smart (default), ours, theirs
🧪 Automated test execution and linting after resolution
📋 Comprehensive conflict resolution report
🏗️ Worktree-aware operation
📖 Extensive reference documentation

Usage:

Bash
/git-workflow:resolve-conflicts                         # Merge target into current branch
/git-workflow:resolve-conflicts --target develop        # Specify target branch
/git-workflow:resolve-conflicts --dry-run               # Analyze only, no changes
/git-workflow:resolve-conflicts --no-tests              # Skip test execution
/git-workflow:resolve-conflicts --strategy smart        # Strategy: smart, ours, theirs
/git-workflow:resolve-conflicts feature/task-009        # Specify branch
/git-workflow:resolve-conflicts 42                      # PR number

Smart Strategy Capabilities:

Lock-Files: Automatic regeneration (uv.lock, bun.lockb, package-lock.json)
Import blocks: Union merge with alphabetical sorting
Additive changes: Both sides preserved (routes, exports, configs)
Same-line edits: Context analysis with feature branch prioritization
Alembic migrations: Revision chain linearization and head merging
Architectural conflicts: Halts for user decision

References: - Strategies - Detailed merge strategies and decision tree - Best Practices - Prevention and resolution guidelines - Troubleshooting - Common issues and solutions

`/git-workflow:pr-edit-history`¶

Display the edit history of a GitHub Pull Request description.

Features:

📜 View all edits made to PR description
👤 See who made each edit
⏰ Timestamps for all changes
🔍 Diff view between versions

Usage:

Bash
/git-workflow:pr-edit-history           # For current branch's PR
/git-workflow:pr-edit-history 123       # For PR #123

Skills¶

This plugin includes three powerful skills for enhanced performance. See Skills & Agents Activation Guide for details.

professional-commit-workflow¶

~70% faster than standard command with reduced token consumption.

Activation:

Via command: /git-workflow:commit --with-skills

Features:

Automatic project type detection
Pre-commit validation (Java, Python, React, Docs)
Emoji Conventional Commit generation
JSON-based configuration
Python module extensibility

Location: ./skills/professional-commit-workflow/

Documentation: professional-commit-workflow/README.md

professional-pr-workflow¶

Automated PR creation with branch management and code formatting.

Activation:

Via command: /git-workflow:create-pr --with-skills

Features:

Branch creation and management
Automatic commit splitting
Code formatter integration (Biome, Black, Prettier)
PR description generation
GitHub CLI integration

Location: ./skills/professional-pr-workflow/

Documentation: professional-pr-workflow/README.md

Installation¶

This plugin is part of the Talent Factory marketplace.

Add marketplace to .claude/settings.json:

JSON
{
  "extraKnownMarketplaces": {
    "talent-factory": {
      "source": {
        "source": "github",
        "repo": "talent-factory/claude-plugins"
      }
    }
  },
  "enabledPlugins": {
    "git-workflow@talent-factory": true
  }
}

Install via Claude Code:

Bash
1 2 3	`claude /plugin # Select "Browse Plugins" → "talent-factory" → "Git Workflow"`

Project Structure¶

Text Only

git-workflow/
├── .claude-plugin/
│   └── plugin.json           # Plugin metadata
├── commands/
│   ├── commit.md             # Commit command
│   ├── create-pr.md          # PR creation command
│   ├── pr-edit-history.md    # PR edit history
│   └── resolve-conflicts.md  # Merge conflict resolution
├── references/
│   ├── commit/
│   │   ├── best-practices.md
│   │   ├── commit-types.md
│   │   ├── pre-commit-checks.md
│   │   └── troubleshooting.md
│   ├── create-pr/
│   │   ├── code-formatting.md
│   │   ├── commit-workflow.md
│   │   ├── pr-template.md
│   │   └── troubleshooting.md
│   └── resolve-conflicts/
│       ├── best-practices.md
│       ├── strategies.md
│       └── troubleshooting.md
├── skills/
│   ├── post-merge-cleanup/
│   ├── professional-commit-workflow/
│   └── professional-pr-workflow/
└── README.md

Best Practices¶

Commit Workflow¶

Always use /git-workflow:commit instead of direct git commit
Let automated checks run - they catch issues early
Write descriptive messages - explain the "why", not just the "what"
Keep commits atomic - one logical change per commit
Use imperative mood - "Add feature" not "Added feature"
No tool signatures - commits should not include "Generated with Claude Code"

PR Workflow¶

Use /git-workflow:create-pr for consistency across team
Review PR description before creating
Keep PRs small - ideally < 400 lines changed
Link related issues - use "Fixes #123" syntax
Document breaking changes clearly
Include test plan - how to verify changes

Code Quality¶

✅ Run linters before committing
✅ Ensure all tests pass
✅ Update documentation
✅ Remove debug statements
✅ Check for secrets/API keys
✅ Review your own diff first

Examples¶

Creating a Feature Commit¶

Bash
/git-workflow:commit

# Claude analyzes changes and generates:
✨ feat: Benutzer-Authentifizierung mit OAuth2 hinzugefügt

Implementiert OAuth2-Flow für Google und GitHub Login.
Erweitert User-Model mit OAuth-Feldern.

- Google OAuth2 Provider konfiguriert
- GitHub OAuth2 Provider konfiguriert
- Token-Refresh-Mechanismus implementiert
- Session-Management aktualisiert

Closes #123

Creating a Pull Request¶

Bash
/git-workflow:create-pr

# Claude:
# 1. Analyzes all commits in branch
# 2. Checks branch status
# 3. Runs code formatters (if enabled)
# 4. Generates comprehensive PR description
# 5. Creates PR with `gh pr create`
# 6. Returns PR URL

Checking PR Edit History¶

Bash
/git-workflow:pr-edit-history 456

# Claude displays:
# - All edits to PR #456
# - Who made each edit
# - When edits were made
# - Diff between versions

Advanced Usage¶

Commit with Skill Integration¶

Bash
/git-workflow:commit --with-skills

# Uses professional-commit-workflow skill:
# - ~70% faster execution
# - Lower token consumption (~300 lines vs ~1400)
# - Same quality output
# - Global configuration

Skip Pre-Commit Checks¶

Bash
/git-workflow:commit --no-verify

# Use when:
# - Checks are failing due to infrastructure issues
# - Emergency hotfix needed
# - Working on non-code files only

PR with Custom Formatting¶

Bash
/git-workflow:create-pr --no-format

# Skips automatic code formatting
# Useful when formatters conflict with team style

Troubleshooting¶

Commit Command Issues¶

Problem: Pre-commit checks fail - Solution: See commit/troubleshooting.md

Problem: Commit message too long - Solution: Keep subject line ≤ 72 characters, use body for details

Problem: Wrong commit type detected - Solution: Claude analyzes changes, but you can override in message

PR Creation Issues¶

Problem: GitHub CLI not found - Solution: Install with brew install gh or download from github.com/cli/cli

Problem: Branch not pushed to remote - Solution: /git-workflow:create-pr will push automatically with -u flag

Problem: PR description truncated - Solution: Large diffs may truncate; commit more frequently

See create-pr/troubleshooting.md for more solutions.

Requirements¶

Git: Version 2.23+ recommended
GitHub CLI: Optional but recommended for /git-workflow:create-pr
Working directory: Must be inside a git repository

Project-Specific: - Java: Maven or Gradle - Python: Ruff/Black, pytest, mypy (optional) - React/Node.js: ESLint, Prettier, TypeScript (optional)

Changelog¶

Version 2.2.2 (2026-02-27)¶

Patch Update: - Added keywords and license fields to plugin.json - Translated command and skill documentation to English - Fixed Swiss German orthography (ss instead of ß) - Updated command references to fully-qualified format

Version 2.2.0 (2026-02-13)¶

Minor Update:

✨ Added /git-workflow:resolve-conflicts command for intelligent merge conflict resolution
📖 Added comprehensive reference documentation (strategies, best practices, troubleshooting)
🧠 Smart merge strategy with semantic code analysis
🔀 Support for smart, ours, and theirs strategies
🧪 Automated test and lint validation after resolution
Now includes 4 commands and 3 professional workflow skills

Version 2.1.0 (2026-02-03)¶

Minor Update:

✨ Added post-merge-cleanup skill for automated branch cleanup after merge
Now includes 3 professional workflow skills

Version 2.0.0 (2026-01-10)¶

Major Update:

✨ Added comprehensive reference documentation
✨ Integrated professional-commit-workflow skill
✨ Integrated professional-pr-workflow skill
✨ Added /git-workflow:pr-edit-history command
📚 Expanded commit types with emoji support
📚 Added troubleshooting guides
🔧 Enhanced pre-commit checks
🔧 Improved PR description generation

Migration from 1.0.0:

All existing commands remain compatible
New --with-skills flag optional
References available for enhanced guidance

Version 1.0.0¶

Initial release with /git-workflow:commit and /git-workflow:create-pr

Support¶

Issues: GitHub Issues
Discussions: GitHub Discussions
Email: support@talent-factory.ch

Contributing¶

See CONTRIBUTING.md in the main repository.

License¶

MIT License - see LICENSE file for details.

Made with ❤️ by Talent Factory GmbH

Git Workflow Plugin¶

Version 2.2.2¶

Commands¶

/git-workflow:commit¶

/git-workflow:create-pr¶

/git-workflow:resolve-conflicts¶

/git-workflow:pr-edit-history¶

Skills¶

professional-commit-workflow¶

professional-pr-workflow¶

Installation¶

Project Structure¶

Best Practices¶

Commit Workflow¶

PR Workflow¶

Code Quality¶

Examples¶

Creating a Feature Commit¶

Creating a Pull Request¶

Checking PR Edit History¶

Advanced Usage¶

Commit with Skill Integration¶

Skip Pre-Commit Checks¶

PR with Custom Formatting¶

Troubleshooting¶

Commit Command Issues¶

PR Creation Issues¶

Requirements¶

Changelog¶

Version 2.2.2 (2026-02-27)¶

Version 2.2.0 (2026-02-13)¶

Version 2.1.0 (2026-02-03)¶

Version 2.0.0 (2026-01-10)¶

Version 1.0.0¶

Support¶

Contributing¶

License¶

`/git-workflow:commit`¶

`/git-workflow:create-pr`¶

`/git-workflow:resolve-conflicts`¶

`/git-workflow:pr-edit-history`¶