merge-fix

name	merge-fix
description	Use this skill for merge conflict resolution where both sides must be understood, intended behavior preserved, conflict markers removed, and path-limited validation run.
os	cross-platform

merge-fix

Use this Skill when the situation matches the frontmatter description. It is cross-platform and tool-neutral: judgment, sequencing, risk boundaries, and human confirmation points live here; deterministic checks should be delegated to installed workflow runtime paths first, then to source repository paths when the runtime is not installed.

Operating System Support

os: cross-platform. The guidance applies to Windows, macOS, and Linux. OS-specific actions must be guarded by detection, explained before use, and skipped when unsupported.

Flow

1. Identify conflicted files. 2. Read both sides and surrounding code. 3. Preserve intended behavior from both branches. 4. Remove markers. 5. Run merge checks and path-limited validation. 6. Summarize resolutions.

Workflow Routing

Prefer installed runtime paths:

• User: ~/.agent-routines/workflows
• Project: .agent-routines/workflows

Source fallback:

• workflows/<workflow-name>/

Recommended workflows: merge-check, gate-check

Human Confirmation Gates

Ask before commit or push, production configuration changes, destructive filesystem actions, database writes, external publishing, broad dependency installation, or changes outside the requested repository.

Failure Routing

Separate root cause from downstream symptoms. Report exact blockers, skipped actions, and the smallest safe next step.