Conflict resolution

06ef8be8 · 高洋 · e48f5518 · 3e329fe0 · 06ef8be8 · 06ef8be8
Commit 06ef8be8 authored Aug 03, 2017 by 高洋
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

mvn_archetype_plugin.png assets/mvn_archetype_plugin.png +0 -0

git-guide.md git-guide.md +1 -1

No files found.
--- a/assets/mvn_archetype_plugin.png
+++ b/assets/mvn_archetype_plugin.png
--- a/git-guide.md
+++ b/git-guide.md
@@ -30,7 +30,7 @@ git对文件的操作都是在四大域上进行的，文件可以在四大域

 ### 2. `clone`命令  
 ***  
- `git clone git@github.com:lavor-zl/Github-Git.git`：从远程服务器克隆一个仓库到本地  
+- `git clone git@github.com:lavor-zl/Github-Git.git`：从远程服务器克隆一个仓库到本地，**如果gitlab发现pull或者push出现SSL问题，先在cmd执行git config --global http.sslVerify false** 

 ## 3. 基本操作  
 ***