"Create feature branch feature-1.10-infrastructure from epic-1-progressive-coherence"

"Commit changes for wave 1.10.1 with message 'Implement catalog change monitor'"

"Merge feature-1.10-infrastructure into epic-1-progressive-coherence"

mcp__git__create_branch(
  branch_name: "feature-1.10-infrastructure",
  from_branch: "epic-1-progressive-coherence"
)

mcp__git__commit(
  message: "feat(wave-1.10.1): Implement catalog change monitor",
  files: ["src/catalog/monitor.ts", "tests/monitor.test.ts"]
)

mcp__git__push(
  branch: "feature-1.10-infrastructure",
  force: false,
  set_upstream: true
)

mcp__git__merge(
  source_branch: "feature-1.10-infrastructure",
  target_branch: "epic-1-progressive-coherence",
  strategy: "squash"  # or "merge", "rebase"
)

gh pr create \
  --base epic-1-progressive-coherence \
  --head feature-1.10-infrastructure \
  --title "Feature 1.10: Infrastructure Complete" \
  --body "Completed waves 1.10.1, 1.10.2, 1.10.3"

mcp__git__checkout(
  branch: "development"
)

mcp__git__delete_branch(
  branch: "feature-1.10-infrastructure",
  force: false,
  remote: true
)

def validate_branch_protection(branch_name):
    """Prevent operations on protected branches."""
    if branch_name == "main":
        return {
            "allowed": False,
            "reason": "Cannot perform direct operations on main branch"
        }
    return {"allowed": True}

def validate_branch_name(branch_name, branch_type):
    """Validate branch name follows conventions."""
    patterns = {
        "epic": r"^epic-\d+-[a-z0-9-]+$",
        "feature": r"^feature-\d+\.\d+-[a-z0-9-]+$",
        "wave": r"^wave-\d+\.\d+\.\d+-[a-z0-9-]+$",
        "hotfix": r"^hotfix-[a-z0-9-]+$"
    }
    if not re.match(patterns[branch_type], branch_name):
        return {
            "valid": False,
            "reason": f"Branch name doesn't match {branch_type} pattern",
            "expected_pattern": patterns[branch_type]
        }
    return {"valid": True}

def validate_commit_message(message):
    """Validate commit message follows conventional commits."""
    pattern = r"^(feat|fix|docs|style|refactor|test|chore)(\(.+\))?: .+"
    if not re.match(pattern, message):
        return {
            "valid": False,
            "reason": "Commit message doesn't follow conventional commits format",
            "expected_format": "type(scope): description"
        }
    return {"valid": True}

def verify_branch_created(branch_name):
    """Verify branch was created successfully."""
    result = mcp__git__list_branches()
    if branch_name not in result["branches"]:
        return {
            "success": False,
            "reason": "Branch not found after creation"
        }
    return {"success": True}

def verify_remote_sync(branch_name):
    """Verify branch is synchronized with remote."""
    local_sha = mcp__git__get_branch_sha(branch=branch_name)
    remote_sha = mcp__git__get_branch_sha(branch=f"origin/{branch_name}")

    if local_sha != remote_sha:
        return {
            "synchronized": False,
            "local_sha": local_sha,
            "remote_sha": remote_sha
        }
    return {"synchronized": True}

def rollback_branch_creation(branch_name):
    """Delete branch if creation failed partially."""
    try:
        mcp__git__delete_branch(branch=branch_name, force=True)
        return {"rollback": "success", "message": "Branch deleted"}
    except Exception as e:
        return {"rollback": "failed", "error": str(e)}

def rollback_commit():
    """Undo last commit if it has issues."""
    mcp__git__reset(mode="soft", target="HEAD~1")
    return {"rollback": "success", "message": "Commit undone, changes staged"}

def rollback_push(branch_name, previous_sha):
    """Reset branch to previous state before push."""
    mcp__git__reset(mode="hard", target=previous_sha)
    mcp__git__push(branch=branch_name, force=True)
    return {"rollback": "success", "message": f"Branch reset to {previous_sha}"}

def rollback_merge():
    """Abort merge if conflicts occur."""
    mcp__git__merge_abort()
    return {"rollback": "success", "message": "Merge aborted, working directory restored"}

## Create Epic Branch: epic-1-progressive-coherence

**Pre-Checks**:
- ✅ Currently on development branch
- ✅ Development branch is clean (no uncommitted changes)
- ✅ Development branch up-to-date with remote
- ✅ Epic branch name follows convention: `epic-\d+-[a-z0-9-]+`

**MCP Operations**:
1. Create branch from development

2. Push branch to remote

**Post-Validation**:
- ✅ Branch created locally
- ✅ Branch pushed to remote
- ✅ Branch tracks origin/epic-1-progressive-coherence
- ✅ Currently on epic-1-progressive-coherence branch

**Result**: SUCCESS - Epic branch created and ready for features

## Commit Wave 1.10.1 Implementation

**Pre-Checks**:
- ✅ Currently on feature-1.10-infrastructure branch
- ✅ Changes staged (2 files modified)
- ✅ No merge conflicts
- ✅ Commit message follows convention: `feat(wave-1.10.1): ...`

**MCP Operations**:
1. Verify staged changes

2. Create commit

3. Push commit

**Post-Validation**:
- ✅ Commit created with correct message
- ✅ Commit contains expected files
- ✅ Commit pushed to remote
- ✅ Remote branch updated

**Result**: SUCCESS - Wave 1.10.1 committed and pushed

## Merge feature-1.10-infrastructure → epic-1-progressive-coherence

**Pre-Checks**:
- ✅ Feature branch has all waves committed
- ✅ Feature branch pushed to remote
- ✅ No uncommitted changes
- ✅ Epic branch exists
- ✅ No merge conflicts detected

**MCP Operations**:
1. Switch to epic branch

2. Pull latest from remote

3. Merge feature branch

4. Push merge

**Post-Validation**:
- ✅ Merge completed without conflicts
- ✅ All feature commits in epic branch
- ✅ Epic branch pushed to remote
- ✅ Feature branch can be deleted

**Result**: SUCCESS - Feature merged to epic

## Create PR: development → main

**Pre-Checks**:
- ✅ Development branch pushed to remote
- ✅ Development has commits ahead of main
- ✅ No existing PR from development to main
- ✅ Branch relationship valid (development → main allowed)
- ✅ PR branch check workflow will pass

**Operation**:
```bash
gh pr create \
  --base main \
  --head development \
  --title "Release: Sprint 5.1 Complete" \
  --body "## Summary

Completed waves:
- Wave 1.10.1: Catalog change monitor
- Wave 1.10.2: Template staleness detection
- Wave 1.10.3: Impact analysis

## Testing
All tests passing, ready for release."

---

## Integration with Workflow

### Before Every Git Operation

1. Invoke `git-repository-setup-validation` (if not already done)
2. Verify repository properly configured
3. Use `git-safe-operations` for all git commands
4. Validate operation before executing

### During Development

1. Use safe operations for branch creation
2. Use safe operations for commits
3. Use safe operations for merges
4. Get rollback support automatically

### Error Handling

```markdown
If safe operation fails:
1. Check error message from skill
2. Review pre-check failures
3. Fix issues (e.g., uncommitted changes)
4. Retry operation
5. If still failing, use rollback