resolving-merge-conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.
- License 许可
- MIT
- 最近更新
- 2026-11-10
- 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 资源文件 46
- 参考文档agents/openai.yaml113 B
- 参考文档references/bibliography.md7.9 KB
- 参考文档references/flow-framework.md4.8 KB
- 参考文档references/flow-prompts.lock6.0 KB
- 参考文档references/prompts/find/content-planning-for-topical-relevance-prompt.md2.1 KB
- 参考文档references/prompts/find/content-prioritization-prompt.md2.1 KB
- 参考文档references/prompts/find/keyword-research-prompt.md2.1 KB
- 参考文档references/prompts/find/keyword-variations-for-topical-relevance-prompt.md2.1 KB
- 参考文档references/prompts/find/prompt-audience-avatar.md2.1 KB
- 参考文档references/prompts/leverage/backlink-competition-prompt.md2.1 KB
- 参考文档references/prompts/local/ai-homepage-rewrite-prompt.md2.1 KB
- 参考文档references/prompts/local/claude-deep-research-prompt.md2.1 KB
- 参考文档references/prompts/local/gbp-categories-prompt.md2.1 KB
- 参考文档references/prompts/local/gbp-description-claude-prompt-1.md2.1 KB
- 参考文档references/prompts/local/gbp-description-claude-prompt-2.md2.1 KB
- 参考文档references/prompts/local/gbp-description-claude-prompt-3.md2.1 KB
- 参考文档references/prompts/local/gbp-services-prompt.md2.0 KB
- 参考文档references/prompts/local/prompt-generating-a-meta-description.md2.1 KB
- 参考文档references/prompts/local/prompt-generating-a-title-tag.md2.1 KB
- 参考文档references/prompts/local/prompt-rewriting-existing-homepage.md2.1 KB
- 参考文档references/prompts/local/prompt-rewriting-existing-service-page.md2.1 KB
- 参考文档references/prompts/optimize/ai-detector-test-follow-up-prompt.md2.1 KB
- 参考文档references/prompts/optimize/ai-supporting-pages-rewrite-prompt.md2.1 KB
- 参考文档references/prompts/optimize/basic-prompt.md2.0 KB
- 参考文档references/prompts/optimize/blog-post-outline-prompt.md2.1 KB
- 参考文档references/prompts/optimize/blog-post-writing-prompt.md2.1 KB
- 参考文档references/prompts/optimize/claude-prompt-1.md2.0 KB
- 参考文档references/prompts/optimize/claude-prompt-2.md2.0 KB
- 参考文档references/prompts/optimize/ctr-audit-prompt.md2.0 KB
- 参考文档references/prompts/optimize/follow-up-prompt-1.md2.1 KB
- 参考文档references/prompts/optimize/follow-up-prompt-2.md2.1 KB
- 参考文档references/prompts/optimize/follow-up-prompt.md2.0 KB
- 参考文档references/prompts/optimize/paa-question-rewording-prompt.md2.1 KB
- 参考文档references/prompts/optimize/prompt-core-30-content-audit.md2.1 KB
- 参考文档references/prompts/optimize/property-content-with-authority-audit-prompt.md2.1 KB
- 参考文档references/prompts/optimize/reddit-claude-prompt.md2.1 KB
- 参考文档references/prompts/optimize/schema-prompt-1.md2.0 KB
- 参考文档references/prompts/optimize/step-1-the-chatgpt-discovery-prompt.md2.1 KB
- 参考文档references/prompts/optimize/step-2-the-follow-up-qualifying-prompt.md2.1 KB
- 参考文档references/prompts/optimize/technical-audit-prompt.md2.1 KB
- 参考文档references/prompts/optimize/visibility-follow-up-prompt.md2.1 KB
- 参考文档references/prompts/optimize/visiblity-prompt.md2.0 KB
- 参考文档references/prompts/README.md4.4 KB
- 参考文档references/prompts/win/bofu-page-brief-generator.md2.2 KB
- 参考文档references/prompts/win/conversion-audit-prompt.md2.2 KB
- 参考文档references/prompts/win/dual-surface-content-scorecard.md2.1 KB
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
volontariapp-user-account-deletion
Suppression de compte en deux temps (PENDING_DELETION): requestDeletionWithUserDeleted, finalizeDeletion, fan-out de user.deleted vers les domaines et gather ws. A utiliser pour tout changement de domain-user touchant la suppression, le statut ou le cycle de vie d'un user.
volontariapp-proto-contract-evolution
Modifier un contrat Protobuf de proto-registry (champ, message, enum, RPC) sans casser la compatibilité wire, puis suivre la cascade proto-registry, PR automatique dans npm-packages, publication, consommateurs. À utiliser avant toute édition d'un .proto.
volontariapp-meta-scripts
Utiliser et faire evoluer la CLI Node de meta (setup, doctor, migrate, certs, repos, bump) et le manifeste repos.json, source unique des repos et unites du workspace.
volontariapp-implement-async-event-flow
Guide pas-à-pas pour concevoir et implémenter un flux asynchrone complet (messaging -> outbox -> post-processors -> ws-service -> client).
research
Investigate a question against high-trust primary sources and capture the findings as a Markdown file in the repo. Use when the user wants a topic researched, docs or API facts gathered, or reading legwork delegated to a background agent.
prototype
Build a throwaway prototype to answer a design question. Use when the user wants to sanity-check whether a state model or logic feels right, or explore what a UI should look like.