diff --git a/.github/pull.yml b/.github/pull.yml new file mode 100644 index 0000000..64e2e2b --- /dev/null +++ b/.github/pull.yml @@ -0,0 +1,13 @@ +# 参考:https://wei.github.io/pull/ +version: '1' +rules: + - base: main + upstream: 142vip:main + mergeMethod: hardreset + - base: next + upstream: 142vip:next + mergeMethod: hardreset + # 兼容master分支 + - base: master + upstream: 142vip:master + mergeMethod: hardreset diff --git a/docs/.vuepress/public/mind-map/ccp-map.html b/docs/.vuepress/public/mind-map/ccp-map.html index 8c2c13c..01c8d5a 100644 --- a/docs/.vuepress/public/mind-map/ccp-map.html +++ b/docs/.vuepress/public/mind-map/ccp-map.html @@ -16,11 +16,11 @@ height: 100vh; } - +
- + })(() => window.markmap,null,{"content":"计算机组成原理","children":[{"content":"引论","children":[],"payload":{"tag":"h2","lines":"23,24"}},{"content":"数据的表示和运算","children":[],"payload":{"tag":"h2","lines":"25,26"}},{"content":"存储系统","children":[],"payload":{"tag":"h2","lines":"27,28"}},{"content":"指令系统","children":[],"payload":{"tag":"h2","lines":"29,30"}},{"content":"中央处理器","children":[],"payload":{"tag":"h2","lines":"31,32"}},{"content":"总线","children":[],"payload":{"tag":"h2","lines":"33,34"}},{"content":"输入输出系统","children":[],"payload":{"tag":"h2","lines":"35,36"}},{"content":"一些总结","children":[],"payload":{"tag":"h2","lines":"37,38"}}],"payload":{"tag":"h1","lines":"6,7"}},null)