@namewta/speculo 0.1.17 → 0.1.18

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/template/vendor/resolving-merge-conflicts/SKILL.md +14 -0
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@namewta/speculo",
3
- "version": "0.1.17",
3
+ "version": "0.1.18",
4
4
  "description": "Speculo — specification-driven development framework assets, with a CLI to install and update them across AI coding tools.",
5
5
  "type": "module",
6
6
  "bin": {
package/template/vendor/resolving-merge-conflicts/SKILL.md ADDED
@@ -0,0 +1,14 @@
1
+ ---
2
+ name: resolving-merge-conflicts
3
+ description: "适用于需要解决进行中的 git merge/rebase 冲突的场景。"
4
+ ---
5
+
6
+ 1. **查看当前状态**——merge/rebase 的当前状态。检查 git 历史以及冲突文件。
7
+
8
+ 2. **找到每个冲突的主要来源。** 深入理解每次更改的原因以及原始意图。阅读提交消息、查看 PR、查看原始 issue/工单。
9
+
10
+ 3. **解决每个冲突块。** 在可能的情况下保留两种意图。当不兼容时，选择与合并声明目标匹配的那个并注明权衡。**不要**发明新行为。始终解决；永远不要 `--abort`。
11
+
12
+ 4. 发现项目的**自动化检查**并运行它们——通常是类型检查，然后是测试，然后是格式化。修复合并破坏的任何内容。
13
+
14
+ 5. **完成 merge/rebase。** 暂存所有内容并提交。如果正在 rebase，继续 rebase 过程直到所有提交都被 rebase。