Merge Workflow

​

Overview

​

Merge Checklist

• All verification commands passed
• The revision is approved
• No merge conflicts with the base branch
• The branch is up to date

​

Merging via the UI

1. Open a DONE ticket
2. Click “Merge”
3. Draft runs the merge checklist
4. If all checks pass, the branch is merged

​

Merging via the API

# Check merge readiness
curl http://localhost:8000/tickets/{id}/merge-checklist

# Execute merge
curl -X POST http://localhost:8000/tickets/{id}/merge

​

Merge Strategy

merge_config:
  strategy: merge    # merge, squash, or rebase

​

Pull Request Integration

# Create a PR for a completed ticket
curl -X POST http://localhost:8000/tickets/{id}/pull-request

• Ticket title and description
• Diff summary
• Verification results

​

Handling Conflicts

1. The merge checklist flags the conflict
2. You can resolve manually in the worktree
3. Or send the ticket back to EXECUTING for the agent to resolve

​

Cleanup