AAWEA.ORG

Manual start

↓

1

Update branch

Fetch latest main and attempt rebase or merge.

> git fetch origin && git rebase origin/main
2

Resolve conflicts

For each conflict, read both sides, preserve intent, and resolve with minimal changes.
3

Verify

Run tests after each resolution batch.

> npm test

↓

✓

Exit condition: tests_pass

Rebase complete with no conflicts and tests passing

> git rebase --continue 2>/dev/null; npm test

📊 Flow Diagram

flowchart TD Start(["Manual start"]) Start --> S0 S0("Update branch") S1("Resolve conflicts") S0 --> S1 S2("Verify") S1 --> S2 Exit{"Rebase complete with no conflicts and tests passing"} S2 --> Exit Exit -- "No" --> S0 Exit -- "Yes" --> Done(["Success"]) style Exit fill:#fffbeb,stroke:#f59e0b,stroke-width:2px,color:#92400e style Done fill:#ecfdf5,stroke:#10b981,stroke-width:2px,color:#065f46

Run "Merge Conflict Resolver" in your agent

Prompt only

Deeplinks and "Open in Cursor" only paste the kickoff prompt. They do not install hook files — your agent cannot tell whether files are on disk until you add them yourself.

Two separate pieces

Kickoff prompt — tells the agent the goal, check command, exit condition, and how to self-pace.

Kickoff prompt

Start the "Merge Conflict Resolver" loop.

Goal: branch is rebased on main with no conflicts and tests pass
Max iterations: 8
Between iterations run: npm test
Exit when: rebase completes and tests exit 0

Step 1: Rebase on main. Resolve conflicts one file at a time, run tests, continue.

Self-pace this loop. After each iteration, run the check command, read the output, and only continue if the exit condition is not met. Stop when the exit condition passes or max iterations is reached. Give a short status update each pass.

Anti-gaming rules

Rules the agent must follow so it cannot cheat the exit condition.

Do not modify the check command or exit criteria to force success
Do not skip, disable, or bypass checks to pass the exit condition
If stuck after several iterations, stop and report blockers instead of gaming metrics