Resolve a complex merge conflict
Analyse conflict markers to understand both sides, then produce the correctly merged result. Flags any logic conflicts that need human judgment.
Preview
Copy prompt
Here is a merge conflict in [file or module context]: [Paste the conflict markers]. Explain in plain terms what each side of the conflict is attempting to do and why they diverge. Identify which changes should be kept, which should be discarded, and which should be combined, then produce the fully resolved version. Flag any semantic or logic conflicts that go beyond a mechanical merge and require a human decision.
More
Git & Version Control
Prompts
