Merge Conflict Resolution Harness
Resolve complex Git merge and rebase conflicts safely by reconstructing each side's intent before touching a single line — designed for Cursor, Claude Code, and Aider agentic workflows.
A 4-step agentic workflow pack for coding built to run with Claude Code, Cursor, Aider, ChatGPT, and Claude. Open the Markdown files, fill the variables, and paste into your model. Most buyers get a reviewable result in about 10 minutes.
- Parse every conflict hunk with full surrounding context so no intent is invisible to the agent
- Reconstruct what each branch author was trying to achieve before a single line is resolved
- Propose a merged resolution that preserves both sides' intent rather than silently discarding one
- Generate a concrete verification checklist — unit tests, integration points, and behavior contracts to confirm the resolution is correct
- Works in any agentic editor (Cursor, Claude Code, Aider) or plain chat — no tools required
- Covers three-way merges, octopus merges, and rebase conflict sequences in one structured workflow
Prompt Customization Service — optional help adapting variables and output to your brand voice. Choose your tier at checkout (not tied to this prompt's price).
This pack is $8 on its own. Buying every pack separately costs $935. The Lifetime Bundle is $149 one-time — you save $786 (84% off) and unlock every future pack free.
Get the Lifetime Bundle — $149Paste the license key from your receipt. It must match this prompt pack.
What ships with your purchase
Prompt files
Plain Markdown files with `{{variables}}` you fill in, ready to paste into ChatGPT, Claude, or Gemini. No setup, no tooling required.
Usage guide
Variable reference, model compatibility, examples, and customization tips so you can adapt the pack to your brand voice.
Lifetime updates
When we improve the pack, you get the new version automatically. Email support included with every purchase.
Models tested: Claude Code, Cursor, Aider, ChatGPT, Claude.
The workflow inside this pack
4 composable prompts you run in order — each one picks up where the last left off.
- Step 1
Conflict Reader
Paste in your conflicted files (with <<<<<<< / ======= / >>>>>>> markers) and the agent extracts every hunk, labels the sides (ours/theirs), and notes surrounding unchanged context.
- Step 2
Intent Reconstruction
Feed in the conflict inventory and any available commit messages or PR context — the agent reasons about each side's goal and writes a plain-English intent statement for both.
- Step 3
Resolution Proposal
Supply the intent table and conflict hunks and the agent proposes resolved code for each hunk, explaining how both authors' goals are preserved in the merged version.
- Step 4
Verification Steps
Provide the resolution proposals and intent statements and the agent produces a numbered verification checklist — unit test targets, integration points to exercise, and runtime behaviors to confirm.
Perpetual (lifetime) use license
Your one-time purchase includes an ongoing right to use this prompt pack with the AI tools and models you control for your own and your clients' work — not for resale or public redistribution of the files as a product.
We keep the copyright
The prompt files, guides, examples, and bundled assets stay our copyrighted works (or our licensors'). Payment grants the limited license in our Terms only — it does not transfer ownership.
Need help adapting this prompt to your team? Add Prompt Customization Service at checkout.