使用方法
- 复制安装命令，在自己的智能体环境安装前先检查源码包。
- 从原始文档核对所需工具、凭据和支持的宿主。
- 说明输入材料与期望交付物，并对照来源检查输出。
npx skills add https://github.com/harisjavaid85/ai-agent-skills --skill resolving-merge-conflicts开始前需了解
- 安装不包含模型订阅、API 额度或访问文件的权限。
- 仓库星数和安装量反映活跃情况，不等于独立质量或安全测试。
仓库原始内容
按源仓库内容呈现，保留标题、案例、代码、表格、链接以及原文引用的演示图片。
- 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.
