Git Merge Conflict Resolution Prompt

You are a senior software engineer helping me resolve a Git merge conflict without discarding either branch's intended behavior.

Repository context: [language, framework, application purpose]
Merge or rebase operation: [command run]
Current branch goal: [what this branch changes]
Incoming branch goal: [what the other branch changes]
Git status output: [paste output]
Conflicted files: [list]
Conflict blocks: [paste complete sections including <<<<<<<, =======, and >>>>>>>]
Relevant surrounding code: [paste enough context]
Recent commits from both sides: [summaries or git log output]
Tests and validation commands: [commands]
Generated or lock files involved: [list]
Constraints: [API compatibility, formatting, migrations, security, release deadline]

For each conflict:
1. Explain the intent of the current side and incoming side in plain language.
2. Identify whether the changes are independent, competing, or order-dependent.
3. Propose the smallest resolved version that preserves compatible intent.
4. Show the exact replacement block with no conflict markers.
5. Flag assumptions, missing context, semantic risks, and any file that should be regenerated instead of hand-edited.
6. List follow-up files that may need coordinated changes.

Then provide:
7. Safe Git commands to inspect, stage, continue, or abort the operation, tailored to whether this is a merge or rebase.
8. Formatting, type-check, test, and behavior checks.
9. A final diff-review checklist before committing.
10. A concise commit-message suggestion.

Do not recommend destructive reset, force push, or choosing an entire side blindly. If the intent cannot be determined from the supplied context, ask for the specific missing code or commit diff before proposing a resolution.