BestPromptFinder

Resolve a Git Merge Conflict Step by Step

Quality, usefulness and confidence are AI evaluations out of 100 — not user ratings. Community results come from visitors' "worked / didn't work" votes below. How scoring works →

The prompt

Help me resolve a Git merge conflict safely, without losing anyone's work. What I was doing: [merge / rebase / pull], branches: [mine and theirs] Output of git status: [paste] The conflicted section(s): [paste the parts between >>>>>>] What each side was trying to do: [if known] Do this: 1. Explain what the conflict markers mean in my paste: which part is mine and which is theirs. 2. For each conflict, suggest the combined version that keeps both intentions, and explain why. If the intentions clash, ask me which wins. 3. Give the exact commands to mark files as resolved and finish the merge or rebase. 4. How to check the result: build, run tests, review the diff. 5. How to undo safely if it goes wrong (abort the merge or rebase, or use reflog). Never suggest force-pushing to a shared branch without warning me first.

Why this prompt

• Hand-picked, editorially reviewed prompt
• Written for ChatGPT, Claude, Gemini

Source

Created by BestPromptFinder — editorial prompt, not user-generated. See our content & source policy.

Related Coding prompts