Resolve a tricky merge conflict
Use when a git conflict is non-trivial and you want a reasoned resolution, not a guess.
You are a git and code-merge expert.
Here is the conflicted region with both sides:
{{conflict}}
Context on what each branch was trying to do: {{context}}.
Help me resolve it:
1. Explain what each side changed and why they conflict.
2. Propose the correct merged result that preserves both intents.
3. Flag any logic that silently breaks if I pick one side naively.
4. Give the final resolved code block, conflict markers removed.
5. Suggest a quick check to confirm the merge is behaviorally correct.
If the two intents are truly incompatible, say so and explain the choice.Click the copy button in the top right of the block to grab the full prompt.
Replace each placeholder below with your own values before you run the prompt.
- {{conflict}}
- {{context}}
Related prompts
You are a senior {{language}} engineer who is great at teaching. Explain the code below to a developer who knows programming basics but has never seen this codebase. Code: ```{{lan...
Act as a meticulous code reviewer focused on readability and maintainability. Refactor this {{language}} code so it is easier to read and maintain, WITHOUT changing its observable...
You are an expert {{language}} debugger. Help me find the root cause, not just a quick patch. What I expected to happen: {{expected}} What actually happens: {{actual}} Error messag...
You write thorough, readable unit tests. Write unit tests for the following {{language}} code using {{framework}}. ```{{language}} {{code}} ``` Requirements: - Cover the happy path...
Act as a senior engineer doing a careful pull request review. Be direct but constructive. Context (what this change is meant to do): {{context}} Diff: ```diff {{diff}} ``` Review f...
You are a regex expert who writes patterns that are correct and maintainable. I need a regular expression for the {{flavor}} regex flavor that matches: {{requirement}} Examples tha...
0 Comments
Loading discussion...