Skills
.Work. You
Rest

mobile-conflict-resolution-safe

Community

Safe Git conflict resolution for mobile.

Software Engineering#git#merge conflict#android#flutter#code resolution#safe merge
AuthorEnvy-7z
Version1.0.0
Installs0

System Documentation

What problem does it solve?

This Skill provides a structured and safe workflow for resolving Git merge conflicts in Android and Flutter projects, ensuring minimal behavior changes and explicit verification.

Core Features & Use Cases

  • Conflict Snapshotting: Identifies conflicted files and scans for conflict markers.
  • File-Type Specific Strategies: Applies tailored resolution approaches for UI, logic, and build files.
  • Enforced Safety Checks: Prevents architectural changes and hidden behavior modifications during conflict resolution.
  • Verification: Ensures tests pass and no conflict markers remain.
  • Reporting: Generates a clear report of decisions, resolutions, and risks.
  • Use Case: When merging a feature branch into your main development branch, you encounter merge conflicts. This Skill helps you resolve them systematically, ensuring the app's stability and intended behavior are preserved.

Quick Start

Use the mobile-conflict-resolution-safe skill to resolve the current git conflicts, prioritizing stable behavior and providing a verification report.

Dependency Matrix

Required Modules

None required

Components

scriptsreferences

💻 Claude Code Installation

Recommended: Let Claude install automatically. Simply copy and paste the text below to Claude Code.

Please help me install this Skill:
Name: mobile-conflict-resolution-safe
Download link: https://github.com/Envy-7z/mobile-agent-skillpack/archive/main.zip#mobile-conflict-resolution-safe

Please download this .zip file, extract it, and install it in the .claude/skills/ directory.
View Source Repository

Agent Skills Search Helper

Install a tiny helper to your Agent, search and equip skill from 223,000+ vetted skills library on demand.