envy-7z/mobile-conflict-resolution-safe
skills/mobile-conflict-resolution-safe/SKILL.md
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.
tools
Updated Apr 5, 2026
$ install --global
skillsauthnpx skillsauth add envy-7z/mobile-agent-skillpack mobile-conflict-resolution-safeInstall this skill globally with one command. Works with Claude Code, Cursor, and Windsurf.
Security Scan Results
3 of 9 scanners reported clean
Some scanners were skipped, did not run, or reported a non-clean status. Review each row below.
3
Scanners Passed
9
Scanners in report
Clean
TrivyContainer and dependency vulnerability scanner
95%
Clean
SemgrepStatic code analysis for vulnerabilities
95%
Clean
mcp-scan (Snyk)Model Context Protocol security validation
95%
Skipped
Snyk (dep)Open source security scanning
50%
Skipped
Socket.devSupply chain security analysis
50%
Skipped
VirusTotalMulti-engine malware detection
50%
Skipped
CrowdStrikeAdvanced threat intelligence
50%
Skipped
OSV-ScannerOpen Source Vulnerability database check
50%
Skipped
OWASP Dep-Check
50%
Last scanned: Apr 5, 2026, 2:00 AM5.3s4 files scanned
SKILL.md
- 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
BLOCKand 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.shreferences/conflict-resolution-rules.md
Related Skills
envy-7z/writing-plans
development
VerifiedTrustedCommunity
Use when you have a spec or requirements for a multi-step task, before touching code
SKILL.mdUpdated Apr 5, 2026
envy-7z/verification-before-completion
data-ai
VerifiedTrustedCommunity
Use when about to claim work is complete, fixed, or passing, before committing or creating PRs - requires running verification commands and confirming output before making any success claims; evidence before assertions always
SKILL.mdUpdated Apr 5, 2026
envy-7z/using-git-worktrees
tools
VerifiedTrustedCommunity
Use when starting feature work that needs isolation from current workspace or before executing implementation plans - creates isolated git worktrees with smart directory selection and safety verification
SKILL.mdUpdated Apr 5, 2026
envy-7z/thinkies
testing
VerifiedTrustedCommunity
Applies Kent Beck's Thinkies—pattern-based thinking habits that generate ideas. Use when stuck, exploring alternatives, or reframing decisions.
SKILL.mdUpdated Apr 5, 2026