issue修改

docs/代码库管理/代码提交.md

@@ -1,4 +1,11 @@
 ---
 sidebar_label: '代码提交'      
 sidebar_position: 3     
----
+---
+  ### **1. 代码提交入口**
+用户可以通过项目代码库中间的文件下的“上传文件”按键来上传文件。
+![](../../static/img/代码库管理/代码提交/上传文件入口.png)<br/>
+ 
+  ### **2. 上传文件**
+进入上传文件页面后，如下图所示，拖动文件，选择提交变更的分支的单击”创建项目“按键即可完成创建。
+![](../../static/img/代码库管理/代码提交/上传文件.png)<br/>

docs/代码库管理/分支管理.md

@@ -1,4 +1,17 @@
 ---
 sidebar_label: '分支管理'      
 sidebar_position: 5    
----
+<<<<<<< HEAD
+---
+  ### **1. 查看分支**
+在代码库栏下，如下图所示，用户可以点击代码库分支从而查看当前项目的所有分支，并且选择对其进行操作。
+![](../../static/img/代码库管理/分支管理/分支管理方式1.jpg)<br/>
+ 
+  ### **2. 合并分支**
+在“和并请求（PR）”下点击“新建合并请求”后，
+![](../../static/img/代码库管理/分支管理/分支管理方式3.png)<br/>
+如下图所示，用户可以选择源分支与目标分支以及填写分支信息后提交分支合并请求。
+![](../../static/img/代码库管理/分支管理/分支管理方式2.png)<br/>
+=======
+---
+>>>>>>> b1071b8d19cbb9f0b73dfa0c48d435e9da842e61

docs/代码库管理/文件管理.md

@@ -1,4 +1,23 @@
 ---
 sidebar_label: '文件管理'      
 sidebar_position: 4     
----
+<<<<<<< HEAD
+---
+### **1. 文件管理位置**
+在代码库界面，可直接对代码库中该分支下的文件进行操作，如下图所示。
+![](../../static/img/代码库管理/文件管理/文件管理入口.png)<br/>
+ 
+### **2. 进入目录**
+点击进入相关目录，找到要编辑的文件，如下图所示。
+![](../../static/img/代码库管理/文件管理/进入文件所在目录.png)<br/>
+  
+### **3. 进入文件编辑页面**
+在线编辑文件，单击文件，即可进入编辑文件页面，如下图所示。
+![](../../static/img/代码库管理/文件管理/进入文件编辑界面.png)<br/>
+  
+### **4. 编辑文件**
+编辑界面右侧有三个按钮，分别是“下载”、“编辑”和“删除”，点击下载即可将文件下载到本地，编辑则可在线编辑文档，删除则将文件从代码库中删除，按钮位置如下图所示。
+![](../../static/img/代码库管理/文件管理/文件编辑按钮.png)<br/>
+=======
+---
+>>>>>>> b1071b8d19cbb9f0b73dfa0c48d435e9da842e61

package-lock.json

@@ -2644,7 +2644,11 @@
     },
     "node_modules/@easyops-cn/autocomplete.js": {
       "version": "0.38.1",
+<<<<<<< HEAD
+      "resolved": "https://registry.npmmirror.com/@easyops-cn/autocomplete.js/-/autocomplete.js-0.38.1.tgz",
+=======
       "resolved": "https://registry.npmjs.org/@easyops-cn/autocomplete.js/-/autocomplete.js-0.38.1.tgz",
+>>>>>>> b1071b8d19cbb9f0b73dfa0c48d435e9da842e61
       "integrity": "sha512-drg76jS6syilOUmVNkyo1c7ZEBPcPuK+aJA7AksM5ZIIbV57DMHCywiCr+uHyv8BE5jUTU98j/H7gVrkHrWW3Q==",
       "dependencies": {
         "cssesc": "^3.0.0",
@@ -2653,7 +2657,11 @@
     },
     "node_modules/@easyops-cn/docusaurus-search-local": {
       "version": "0.35.0",
+<<<<<<< HEAD
+      "resolved": "https://registry.npmmirror.com/@easyops-cn/docusaurus-search-local/-/docusaurus-search-local-0.35.0.tgz",
+=======
       "resolved": "https://registry.npmjs.org/@easyops-cn/docusaurus-search-local/-/docusaurus-search-local-0.35.0.tgz",
+>>>>>>> b1071b8d19cbb9f0b73dfa0c48d435e9da842e61
       "integrity": "sha512-sHQ8jxsVgHH8MNXJlj20nZZfP/Q0peNTAJwKCN2aPuBwfRIoO0i7LmZFaYKenZmVAW/BD2MtfVd65SREmm3zxg==",
       "dependencies": {
         "@docusaurus/plugin-content-docs": "^2.0.0-rc.1",
@@ -7292,7 +7300,11 @@
     },
     "node_modules/immediate": {
       "version": "3.3.0",
+<<<<<<< HEAD
+      "resolved": "https://registry.npmmirror.com/immediate/-/immediate-3.3.0.tgz",
+=======
       "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.3.0.tgz",
+>>>>>>> b1071b8d19cbb9f0b73dfa0c48d435e9da842e61
       "integrity": "sha512-HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q=="
     },
     "node_modules/immer": {
@@ -7852,7 +7864,11 @@
     },
     "node_modules/klaw-sync": {
       "version": "6.0.0",
+<<<<<<< HEAD
+      "resolved": "https://registry.npmmirror.com/klaw-sync/-/klaw-sync-6.0.0.tgz",
+=======
       "resolved": "https://registry.npmjs.org/klaw-sync/-/klaw-sync-6.0.0.tgz",
+>>>>>>> b1071b8d19cbb9f0b73dfa0c48d435e9da842e61
       "integrity": "sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==",
       "dependencies": {
         "graceful-fs": "^4.1.11"
@@ -8008,7 +8024,11 @@
     },
     "node_modules/lunr": {
       "version": "2.3.9",
+<<<<<<< HEAD
+      "resolved": "https://registry.npmmirror.com/lunr/-/lunr-2.3.9.tgz",
+=======
       "resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.9.tgz",
+>>>>>>> b1071b8d19cbb9f0b73dfa0c48d435e9da842e61
       "integrity": "sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow=="
     },
     "node_modules/lunr-languages": {
@@ -14756,7 +14776,11 @@
     },
     "@easyops-cn/autocomplete.js": {
       "version": "0.38.1",
+<<<<<<< HEAD
+      "resolved": "https://registry.npmmirror.com/@easyops-cn/autocomplete.js/-/autocomplete.js-0.38.1.tgz",
+=======
       "resolved": "https://registry.npmjs.org/@easyops-cn/autocomplete.js/-/autocomplete.js-0.38.1.tgz",
+>>>>>>> b1071b8d19cbb9f0b73dfa0c48d435e9da842e61
       "integrity": "sha512-drg76jS6syilOUmVNkyo1c7ZEBPcPuK+aJA7AksM5ZIIbV57DMHCywiCr+uHyv8BE5jUTU98j/H7gVrkHrWW3Q==",
       "requires": {
         "cssesc": "^3.0.0",
@@ -14765,7 +14789,11 @@
     },
     "@easyops-cn/docusaurus-search-local": {
       "version": "0.35.0",
+<<<<<<< HEAD
+      "resolved": "https://registry.npmmirror.com/@easyops-cn/docusaurus-search-local/-/docusaurus-search-local-0.35.0.tgz",
+=======
       "resolved": "https://registry.npmjs.org/@easyops-cn/docusaurus-search-local/-/docusaurus-search-local-0.35.0.tgz",
+>>>>>>> b1071b8d19cbb9f0b73dfa0c48d435e9da842e61
       "integrity": "sha512-sHQ8jxsVgHH8MNXJlj20nZZfP/Q0peNTAJwKCN2aPuBwfRIoO0i7LmZFaYKenZmVAW/BD2MtfVd65SREmm3zxg==",
       "requires": {
         "@docusaurus/plugin-content-docs": "^2.0.0-rc.1",
@@ -18155,7 +18183,11 @@
     },
     "immediate": {
       "version": "3.3.0",
+<<<<<<< HEAD
+      "resolved": "https://registry.npmmirror.com/immediate/-/immediate-3.3.0.tgz",
+=======
       "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.3.0.tgz",
+>>>>>>> b1071b8d19cbb9f0b73dfa0c48d435e9da842e61
       "integrity": "sha512-HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q=="
     },
     "immer": {
@@ -18540,7 +18572,11 @@
     },
     "klaw-sync": {
       "version": "6.0.0",
+<<<<<<< HEAD
+      "resolved": "https://registry.npmmirror.com/klaw-sync/-/klaw-sync-6.0.0.tgz",
+=======
       "resolved": "https://registry.npmjs.org/klaw-sync/-/klaw-sync-6.0.0.tgz",
+>>>>>>> b1071b8d19cbb9f0b73dfa0c48d435e9da842e61
       "integrity": "sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==",
       "requires": {
         "graceful-fs": "^4.1.11"
@@ -18663,7 +18699,11 @@
     },
     "lunr": {
       "version": "2.3.9",
+<<<<<<< HEAD
+      "resolved": "https://registry.npmmirror.com/lunr/-/lunr-2.3.9.tgz",
+=======
       "resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.9.tgz",
+>>>>>>> b1071b8d19cbb9f0b73dfa0c48d435e9da842e61
       "integrity": "sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow=="
     },
     "lunr-languages": {

yarn.lock

@@ -1653,7 +1653,11 @@
 
 "@easyops-cn/autocomplete.js@^0.38.1":
   version "0.38.1"
+<<<<<<< HEAD
+  resolved "https://registry.npmmirror.com/@easyops-cn/autocomplete.js/-/autocomplete.js-0.38.1.tgz"
+=======
   resolved "https://registry.npmjs.org/@easyops-cn/autocomplete.js/-/autocomplete.js-0.38.1.tgz"
+>>>>>>> b1071b8d19cbb9f0b73dfa0c48d435e9da842e61
   integrity sha512-drg76jS6syilOUmVNkyo1c7ZEBPcPuK+aJA7AksM5ZIIbV57DMHCywiCr+uHyv8BE5jUTU98j/H7gVrkHrWW3Q==
   dependencies:
     cssesc "^3.0.0"
@@ -1661,7 +1665,11 @@
 
 "@easyops-cn/docusaurus-search-local@^0.35.0":
   version "0.35.0"
+<<<<<<< HEAD
+  resolved "https://registry.npmmirror.com/@easyops-cn/docusaurus-search-local/-/docusaurus-search-local-0.35.0.tgz"
+=======
   resolved "https://registry.npmjs.org/@easyops-cn/docusaurus-search-local/-/docusaurus-search-local-0.35.0.tgz"
+>>>>>>> b1071b8d19cbb9f0b73dfa0c48d435e9da842e61
   integrity sha512-sHQ8jxsVgHH8MNXJlj20nZZfP/Q0peNTAJwKCN2aPuBwfRIoO0i7LmZFaYKenZmVAW/BD2MtfVd65SREmm3zxg==
   dependencies:
     "@docusaurus/plugin-content-docs" "^2.0.0-rc.1"
@@ -4547,7 +4555,11 @@ image-size@^1.0.1:
 
 immediate@^3.2.3:
   version "3.3.0"
+<<<<<<< HEAD
+  resolved "https://registry.npmmirror.com/immediate/-/immediate-3.3.0.tgz"
+=======
   resolved "https://registry.npmjs.org/immediate/-/immediate-3.3.0.tgz"
+>>>>>>> b1071b8d19cbb9f0b73dfa0c48d435e9da842e61
   integrity sha512-HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q==
 
 immer@^9.0.7:
@@ -4956,7 +4968,11 @@ kind-of@^6.0.0, kind-of@^6.0.2:
 
 klaw-sync@^6.0.0:
   version "6.0.0"
+<<<<<<< HEAD
+  resolved "https://registry.npmmirror.com/klaw-sync/-/klaw-sync-6.0.0.tgz"
+=======
   resolved "https://registry.npmjs.org/klaw-sync/-/klaw-sync-6.0.0.tgz"
+>>>>>>> b1071b8d19cbb9f0b73dfa0c48d435e9da842e61
   integrity sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==
   dependencies:
     graceful-fs "^4.1.11"
@@ -5102,7 +5118,11 @@ lunr-languages@^1.4.0:
 
 lunr@^2.3.9:
   version "2.3.9"
+<<<<<<< HEAD
+  resolved "https://registry.npmmirror.com/lunr/-/lunr-2.3.9.tgz"
+=======
   resolved "https://registry.npmjs.org/lunr/-/lunr-2.3.9.tgz"
+>>>>>>> b1071b8d19cbb9f0b73dfa0c48d435e9da842e61
   integrity sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==
 
 make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0: