mobile-conflict-resolution-safe - SKILL.md Agent Skill

name: mobile-conflict-resolution-safe description: Safe merge-conflict resolution workflow for Android and Flutter repositories. Use when resolving git conflicts from teammate branches, rebases, or release branches, and you need minimal behavior change, verification evidence, and merge-safe outcomes.

Mobile Conflict Resolution Safe

Overview

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

Workflow

Snapshot conflict state

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

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.

Enforce safety checks

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

Verify

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

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