conflict

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.

설치로 이동

저장소: ryanportfolio/claude-starter
최근 소스 활동: 2026년 7월 9일 23:17
감지된 SKILL.md 언어: 영어
스타: 0
포크: 0

설치 방법

기본적으로 소스를 먼저 확인하는 Prompt가 선택됩니다. 직접 명령으로 전환하거나 로컬 사본을 다운로드할 수도 있습니다.

Codex 또는 Claude로 설치 이 Prompt를 복사해 Codex, Claude 또는 다른 어시스턴트에 붙여 넣으면 Skill 페이지를 검토하고 설치를 진행할 수 있습니다.

직접 명령은 검토 Prompt를 거치지 않습니다. 실행하기 전에 소스를 확인하세요.

npx skills add https://github.com/ryanportfolio/claude-starter --skill conflict

명령은 한 줄로 유지됩니다. 복사하기 전에 가로로 스크롤해 전체 내용을 확인하세요.

로컬 사본을 원하시나요? SkillsMP에서 현재 제공할 수 있는 파일을 다운로드하세요.

소스 파일 검토

설치 여부를 결정하기 전에 SKILL.md와 SkillsMP에 표시된 보조 파일을 읽어 보세요.

SKILL.md

소스 지침 · 읽기 전용 미리보기

검색으로 돌아가기 설치로 돌아가기

addskill

Add a new skill to this repo so it's available in every Claude Code web session. Use when the user says $addskill, asks to "add a skill", "install a skill", "create a skill", or wants a third-party skill (e.g. superpowers) to show up in the available-skills list. Skills must live in the project's .claude/skills/ folder and be committed — personal/global installs do NOT follow the user into the web sandbox.

2026-07-12

brainstorming

Use when the user asks to brainstorm, explore, compare approaches, or design a feature, or when a requested product, interface, workflow, architecture, or behavior change has unresolved goals, competing directions, material tradeoffs, or high-cost ambiguity. Do not use for routine fixes, precise requests, supplied designs/specs, mechanical edits, or backend-only work without a design decision.

2026-07-12

forge-repo-ui-skill

Research current GitHub agent skills for frontend design, UI, UX, web, accessibility, motion, and creative implementation; determine which guidance is actually relevant to the active repository; and synthesize one lean repo-local design skill. Use when a user wants to consolidate overlapping design skills, replace a generic frontend skill, create a repository-specific UI workflow, or repeat a design-skill research and synthesis process in another codebase. Not for ordinary UI implementation or backend-only work.

2026-07-12

이 저장소의 모든 Skills 보기

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.

conflict

소스 정보

설치 방법

소스 파일 검토

이 저장소의 다른 Skills

이 저장소의 다른 Skills

Codex Adapter

Codex Adapter