merge(pro-doc): doc-pro

2021-08-19 22:20:41 +08:00 · 2021-08-19 22:20:41 +08:00 · c699fa0527
parent 2c9e6784b1 9262c6e8c5
commit c699fa0527
1 changed files with 8 additions and 1 deletions
--- a/doc/开发流程.md
+++ b/doc/开发流程.md
@ -108,5 +108,12 @@
    
    git reset 7e8108bc7347ef6e2f01d6bc1d1f249afc82a486
    ```
+  
+- 合并冲突

-    
+  ```sh
+  # B 分支名称
+  git pull origin B
+  ```
+
+-