Prompt · Developer Tools

Merge Conflict Resolver

Resolves git conflict markers by reasoning about the intent of both sides.

Have ready: Paste the conflicted section with <<<<<<< markers

Fill in · 3 fields

PASTE THE SECTION WITH <<<<<<< ======= >>>>>>> MARKERSDESCRIBE YOUR CHANGEDESCRIBE THEIR CHANGE, OR "UNKNOWN"

Your prompt

Help me resolve this merge conflict. Think first, then output the resolved code.

Conflicted section:
[PASTE THE SECTION WITH <<<<<<< ======= >>>>>>> MARKERS]
What my branch was doing: [DESCRIBE YOUR CHANGE]
What the other branch was doing: [DESCRIBE THEIR CHANGE, OR "UNKNOWN"]

Step 1: Explain what each side changed and WHY, in one sentence each.
Step 2: Say whether the two changes are compatible, overlapping, or contradictory.
Step 3: Output the resolved code with no conflict markers.
Step 4: Tell me exactly what to verify after resolving (which tests to run, what behavior to check manually).

If the two sides are genuinely contradictory and intent is unclear, do NOT guess, present both readings and ask me which is correct.

Paste it into Muse or any assistant. Blank fields stay as [brackets].

More like this

Commit Message Writer