conflict

name	conflict
description	Use when a git merge/rebase/cherry-pick is in progress and has left unmerged paths or conflict markers (<<<<<<< / ======= / >>>>>>>) — especially when two parallel sessions edited the same file (the same page/component) and one side now conflicts. Reviews each conflicted hunk and resolves it preserving both sides' intent. Manual $conflict only; does not start merges itself.

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.