conflict

Use only when the user invokes $conflict and a merge, rebase, or cherry-pick has unmerged paths or conflict markers, especially after parallel edits.

Jump to install

Repository: ryanportfolio/AI-Firmware
Last source activity: July 15, 2026 at 01:24
Detected SKILL.md language: English
Stars: 1
Forks: 0

Install options

The review-first prompt is selected by default. You can switch to a direct command or download a local copy.

Install with Codex or Claude Copy this prompt, paste it into Codex, Claude, or another assistant, and let it review the skill page and install it for you.

A direct command skips the review prompt. Inspect the source before running it.

npx skills add https://github.com/ryanportfolio/AI-Firmware --skill conflict

The command stays on one line. Scroll horizontally to inspect it before copying.

Prefer a local copy? Download the files currently available to SkillsMP.

Review the source files

Read SKILL.md and any companion files shown by SkillsMP before deciding whether to install.

SKILL.md

Source instructions · Read-only preview

Back to search Back to installation

writing

Use when writing or editing any prose a person will read (site copy, guides, docs, READMEs, UI text, titles, captions, emails, PR descriptions, release notes) or when a draft reads as machine-made.

2026-07-22

systematic-debugging

Use when encountering any bug, test failure, or unexpected behavior, before proposing fixes

2026-07-22

test-driven-development

Use when implementing any feature or bugfix, before writing implementation code

2026-07-22

View all from this repository

name	conflict
description	Use only when the user invokes $conflict and a merge, rebase, or cherry-pick has unmerged paths or conflict markers, especially after parallel edits.

Codex Adapter

Read ../../../.claude/skills/conflict/SKILL.md completely and follow it as the canonical workflow for this skill.

Resolve every relative script, reference, asset, and template path from the canonical skill directory under .claude/skills/conflict/.
Read ../../../.agents/CODEX-SKILL-COMPATIBILITY.md and apply the status and exceptions for this skill.
Translate Claude Code tool names to the available Codex equivalent as described by the repository AGENTS.md.
Before any Claude Task, Agent, or Workflow step, confirm that the current Codex session exposes the required multi-agent tools. Do not replace independent review with self-review.
Skill invocation alone does not authorize commit, push, PR, merge, deploy, migration, dependency installation, or another outward action unless that action is the user's explicit request.
Follow Codex system, developer, sandbox, approval, and tool instructions when they differ from the canonical workflow.
Keep the canonical Claude skill unchanged unless the user explicitly asks to edit the workflow itself.

conflict

Source facts

Install options

Review the source files

More from this repository

More from this repository

Codex Adapter

Codex Adapter