resolving-merge-conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.
- License 许可
- MIT
- 最近更新
- 2026-11-08
- Stars
- ★ 0
- Forks
- 0
01 前言 Front Matter
- name
- resolving-merge-conflicts
- description
- Use when you need to resolve an in-progress git merge/rebase conflict.
02 资源文件 1
- 参考文档agents/openai.yaml113 B
03 SKILL.md 正文
-
See the current state of the merge/rebase. Check git history, and the conflicting files.
-
Find the primary sources for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check original issues/tickets.
-
Resolve each hunk. Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do not invent new behaviour. Always resolve; never
--abort. -
Discover the project's automated checks and run them, typically typecheck, then tests, then format. Fix anything the merge broke.
-
Finish the merge/rebase. Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.
04 同仓库更多 Skills
sync-skills-openai-yaml
Sync every skill's agents/openai.yaml with its SKILL.md — display name, short description, and implicit-invocation policy.
streamlined-setup-matt-pocock-skills
Configure this repo for the engineering skills using one fixed set of choices: local-markdown issue tracker, default triage labels, single-context domain docs. Overwrites any earlier setup. Run once per repo.
retire-provisional-documents
Retire provisional documentation after making its consumers self-contained and preserving only durable domain language and decision rationale.
coding-agent-sessions
Find, read, list, search, inspect, fetch, export, or reconstruct coding-agent sessions across various agents.
writing-for-agents
Writing documents for agents. Use when creating or editing skills, or modifying AGENTS.md or CLAUDE.md.
wait-what
Stop. That last message did not land: re-pitch it.