orc-resolving-merge-conflicts
Resolve an in-progress git merge or rebase conflict by tracing each side's intent back to primary sources before touching a hunk; always resolve, never --abort
- License 许可
- MIT
- 所属仓库
- HigorAlves/orc
- 最近更新
- 2026-11-07
- Stars
- ★ 7
- Forks
- 0
01 前言 Front Matter
- name
- orc-resolving-merge-conflicts
- description
- Resolve an in-progress git merge or rebase conflict by tracing each side's intent back to primary sources before touching a hunk; always resolve, never --abort
02 资源文件 1
- 参考文档agents/openai.yaml129 B
03 SKILL.md 正文
Read ../../RUNTIME.md first, then ../../content/skills/resolving-merge-conflicts/SKILL.md and follow that workflow.
Resolve paths relative to this installed skill directory. The plugin root is two directories above it.
Pass the user's arguments to the workflow. Load referenced phase modules only when needed.
04 同仓库更多 Skills
writing-plans
Write a comprehensive implementation plan of bite-sized TDD tasks that an engineer with zero codebase context could execute — exact files, code, tests, and verification steps
writing-for-agents
orc's doctrine layer for writing any document an agent consumes — skills, AGENTS.md/CLAUDE.md, reference docs
workspace-mode
Use when cwd is a parent dir holding multiple sibling git repos — defines repo auto-detection, --repos/--repo/--all-repos/--this-repo precedence, per-repo dispatch, and linked-PR mechanics.
wizard
Generate an interactive bash wizard walking a human through work only they can perform — credentials, secrets, one-off migrations
wait-what
Stop and re-pitch — the last message did not land; say it again simply, in the project's own vocabulary.
vitest
Vitest fast unit testing framework powered by Vite with Jest-compatible API