git-workflow

Files (1)

• SKILL.md

SKILL.md (first lines)

# Git Workflow Skill

## Overview
Advanced Git workflow skill for semantic commits, branch management, merge conflict resolution, and pull request creation with best practices.

## Features
- Semantic commit generation
- Branch management strategies
- Merge conflict resolution
- Pull request automation
- Release management
- Pre-commit hooks

## Usage Examples

### Semantic Commit
```bash
/git-workflow commit --type feat --message "Add user authentication"
```

### Create Feature Branch
```bash
/git-workflow branch create --name feature/user-auth --from main
```

### Resolve Conflicts
```bash
/git-workflow conflict resolve --branch feature/new-feature
```

### Create Pull Request
```bash
/git-workflow pr create --title "Implement user login" --body "Adds OAuth integration"
```

## Implementation

### Semantic Commit Manager
```python
class SemanticCommitManager:
    """Handles semantic commit messages and validation"""

    COMMIT_TYPES = {
        'feat': 'New feature',
        'fix': 'Bug fix',
        'docs': 'Documentation',
        'style': 'Code style',
        'refactor': 'Code refactoring',
        'perf': 'Performance improvement',
        'test': 'Test',
        'chore': 'Build process or auxiliary tooling changes'
    }

    def generate_commit_message(self, type, scope, message, body=None):
        """Generate standardized commit message"""
        commit = f"{type}"
        if scope:
            commit += f"({scope})"
        commit += f": {message}"

        if body:
            commit += f"\n\n{body}"

        return commit

    def validate_commit_message(self, message):
        """Validate commit message format"""
        import re
        pattern = r'^(\w+)(?:\(([\w-]+)\))?: .+$'
        return bool(re.match(pattern, message))
```

### Branch Management
```python
class BranchManager:
    """Manages Git branch lifecycle"""

    BRANCH_PATTERNS = {
        'feature': r'feature/\w+',
        'bugfix': r'bugfix/\w+',
        'hotfix': r'hotfix/\w+',
        'release': r'release/\d+\.\d+\.\d+'
    }

    def create_branch(self, name, from_branch='main'):
        """Create new branch with proper naming"""
        # Branch creation logic
        pass

    def cleanup_branches(self, pattern, keep_days=30):
        """Clean up old branches"""
        # Branch cleanup logic
        pass

    def protect_branch(self, branch_name, rules):
        """Configure branch protection rules"""
        # Protection rules setup
        pass
```

### Merge Conflict Resolver
```python
class MergeConflictResolver:
    """Handles merge conflict resolution strategies"""

    def analyze_conflicts(self, conflicted_files):
        """Analyze merge conflicts and categorize"""
        # Conflict analysis
        pass

    def resolve_conflicts(self, strategy='theirs'):
        """Resolve conflicts using specified strategy"""
        # Resolution logic
        pass

    def create_conflict_report(self):
        """Generate report of resolved conflicts"""
        # Report generation
        pass

From eroslifestyle/Claude-Orchestrator-Plugin, MIT.

More from eroslifestyle/Claude-Orchestrator-Plugin