Merge Conflict Resolver

Rebase or merge target branch, resolve conflicts file by file, and loop until the branch is current and tests pass.

Prompt

Step 1 — Update branch
Fetch latest main and attempt rebase or merge.

Check: `git fetch origin && git rebase origin/main`

Step 2 — Resolve conflicts
For each conflict, read both sides, preserve intent, and resolve with minimal changes.

Step 3 — Verify
Run tests after each resolution batch.

Check: `npm test`

Step 4 — Repeat until done
Repeat the steps above until: Rebase complete with no conflicts and tests passing

Check with: `git rebase --continue 2>/dev/null; npm test`

Stop after 8 iterations and report what is blocking.

More Coding prompts