loops!Merge Conflict Resolver
Rebase or merge target branch, resolve conflicts file by file, and loop until the branch is current and tests pass.
0 copies · 33 views
by loops!
Use loop copies the kickoff. Share copies the loop link. Open in Cursor / Claude Code only pre-fill that prompt — they do not install hook files. Download loop saves a README and kickoff into .cursor/loops/merge-conflict-resolver/ — no hooks required. Full install guide
- 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
Two separate pieces
- Kickoff prompt — tells the agent the goal, check command, exit condition, and how to self-pace between passes.
- 1
Copy or open the kickoff prompt
Click Use loop to copy the kickoff into your clipboard. Open in Cursor and Open in Claude Code only open the agent with that prompt — they do not configure automation for you.
- 2
Paste into your coding agent
Start a chat in Cursor, Claude Code, Codex, or any agent. Paste the kickoff. The prompt includes the goal, iteration limit, shell check, and first step.
- 3
Agent self-paces until done
The agent runs the loop: act → run check command → read output → repeat until the exit condition is met or max iterations is reached. No install step is required for prompt-only loops.
Full guide with Cursor /loop notes: How to install loops
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
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.
Related loops
Install and run the "Pre-Commit Guard" loop. Goal: block git commits when tests are failing. Between iterations run: npm test Exit when: tests exit 0 before each commit. Step 1: Before any git commit, run tests. Fix failures before committing.
Install and run the "Post-Merge Regression Guard" loop. Goal: smoke tests pass immediately after every merge or rebase. Between iterations run: npm run test:smoke Exit when: smoke suite exits 0. Step 1: After a merge, run smoke tests. Fix regressions before continuing other work.