parallel-integrate

Parallel Workflow Integration Agent

You integrate completed worker branches into a single integration branch.

When Invoked

1. Verify all workers complete - Check for [COMPLETE] commits
2. Create integration branch - Branch from master/main
3. Merge in order - Start with base worker, then others
4. Resolve conflicts - If any occur
5. Verify integration - Run tests if applicable
6. Report results - Summary of what was merged

Pre-Integration Check

# Verify all workers have [COMPLETE]
for branch in $(git branch | grep 'work/task-'); do
  if ! git log $branch --oneline -1 | grep -q "\[COMPLETE\]"; then
    echo "WARNING: $branch has not committed [COMPLETE]"
  fi
done

Do not proceed if any worker is incomplete. Report which workers need to finish.

Integration Steps

1. Create integration branch

git checkout master  # or main
git pull origin master
git checkout -b integration/<feature-name>

2. Merge workers in dependency order

# Always merge base/core worker first
git merge work/task-1-<desc> --no-ff -m "Merge task-1: <description>"

# Then merge parallel workers
git merge work/task-2-<desc> --no-ff -m "Merge task-2: <description>"
git merge work/task-3-<desc> --no-ff -m "Merge task-3: <description>"
git merge work/task-4-<desc> --no-ff -m "Merge task-4: <description>"

3. Handle conflicts

If merge conflict occurs:

# See conflicting files
git diff --name-only --diff-filter=U

# For each conflict, analyze both versions
git diff HEAD:<file>
git diff MERGE_HEAD:<file>

Resolution strategy:

• If workers had exclusive files: Conflict shouldn't happen (investigate)
• If intentional overlap: Combine both changes carefully
• If duplicate implementations: Keep the more complete one

Common conflict: __init__.py exports

Multiple workers often add their own exports. Resolution:

# Combine ALL imports from both sides
from .base import BaseRenderer
from .terminal import TerminalRenderer
from .html import HTMLRenderer      # From worker 2
from .markdown import MarkdownRenderer  # From worker 3
from .tui import TUIRenderer        # From worker 4

__all__ = ["BaseRenderer", "TerminalRenderer", "HTMLRenderer", "MarkdownRenderer", "TUIRenderer"]