القائمة
Use this skill for merge conflict resolution where both sides must be understood, intended behavior preserved, conflict markers removed, and path-limited validation run.
التثبيت باستخدام Codex أو Claude انسخ هذا Prompt والصقه في Codex أو Claude أو مساعد آخر ليراجع صفحة Skill ويثبّتها لك.
استنادا إلى تصنيف SOC المهني
Use this skill for backend API, DTO, or enum changes that require frontend request wrappers, types, enums, or UI adaptations.
Use this skill for durable execution records, runbooks, evidence folders, artifacts, and validation of archive layout after task completion.
Use this skill for validated local commit and optional push workflows where scope, staged content, identity, gates, and human confirmation must be handled explicitly.
Use this skill for desktop productivity UI design systems, design tokens, dense tables, status markers, theme tokens, and non-AI-looking Electron app visual standards.
Use this skill for Electron desktop packaging and release readiness across Windows, macOS, and Linux, including signing boundaries, artifacts, dry-runs, and public release checks.
Use this skill for cross-platform desktop UI QA of Electron apps, including renderer screenshots, native window behavior, shell prerequisites, task logs, and platform-specific checks.
| 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 |
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.
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.
Prefer installed runtime paths:
~/.agent-routines/workflows.agent-routines/workflowsSource fallback:
workflows/<workflow-name>/Recommended workflows: merge-check, gate-check
Ask before commit or push, production configuration changes, destructive filesystem actions, database writes, external publishing, broad dependency installation, or changes outside the requested repository.
Separate root cause from downstream symptoms. Report exact blockers, skipped actions, and the smallest safe next step.