conflict

Run git status and git diff --name-only --diff-filter=U to list conflicted files, then analyze each conflict hunk. Trivial cases like import merges can be resolved mechanically, while competing logic changes require reviewing commit messages on both sides before deciding.

Read the commit messages and diffs on both branches to understand each side's intent. Deletions that are part of intentional removals should win, while renames should be combined with the other side's logic additions rather than chosen wholesale.

Yes, trivial conflicts like import ordering, whitespace differences, and adjacent additions can be auto-resolved and staged with git add. The changes remain staged for review and are never committed without explicit user approval.

Semantic conflicts occur when code merges cleanly but breaks logically, such as missing imports, signature mismatches, or references to renamed functions. Detect them by running the project's type checker or compiler and grepping for duplicate definitions after resolving textual conflicts.

Escalate when both sides made substantive changes reflecting different intentions, such as competing implementations, conflicting business logic, or divergent config values. Auto-resolving these risks silently making wrong product or architecture decisions.