Mobile Conflict Resolution Safe

Overview

Resolve merge conflicts with minimal, behavior-preserving edits and explicit safety checks.

Workflow

1. Snapshot conflict state

• Run scripts/conflict_snapshot.sh <repo_root>.
• Identify conflicted files, file types, and risk zones.

2. Apply resolution strategy by file type

• UI files: preserve current stable behavior; avoid refactor during conflict resolution.
• Logic files: keep smallest deterministic merge; avoid semantic rewrites.
• Build/release files: keep branch-intended changes only if validated.

3. Enforce safety checks

• No architecture changes while resolving conflicts.
• No hidden behavior changes under conflict markers.
• If uncertain, choose BLOCK and request targeted confirmation.

4. Verify

• Run relevant tests/build checks for touched modules.
• Ensure no conflict markers remain.

5. Report

• Show what was kept from each side and why.
• Provide risk summary and merge recommendation.

Output Format

# Conflict Resolution Report

## Decision
GO-SAFE | BLOCK

## Files Resolved
- ...

## Chosen Sides / Combined Logic
- file: ours/theirs/manual + rationale

## Verification
- Commands:
- Result:

## Risks
- ...

Guardrails

• Keep edits minimal and local.
• No opportunistic refactors.
• No merge recommendation without evidence.

Resources

• scripts/conflict_snapshot.sh
• references/conflict-resolution-rules.md