Resolve Git Conflicts

Resolve git conflicts during rebase or merge by deeply understanding what each branch intended, then producing a correct resolution that preserves both intents.

Language

Respond in the same language the user is using. Match the user's language for all output.

Core Principles

• Understand before acting: Never resolve a conflict without first understanding why it happened and what each side intended.
• Ask when ambiguous: If both branches made intentional, competing changes to the same logic and it's unclear which should win or how to combine them, stop and ask the user. Do not guess or silently pick one side.
• No commit by default: After resolving conflicts, stage the files but do NOT commit or run git rebase --continue / git merge --continue unless the user explicitly asks. Tell the user what to run next.

Step 1: Assess the Situation

git status