From d2a174ebb0e03e1eee621b239abbbd68d37df4d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=91=E9=9C=89=E7=9A=84=E6=A9=84=E6=A6=84=E6=9E=9C?=
 <hoochanlon@outlook.com>
Date: Wed, 8 Jul 2020 01:10:00 +0800
Subject: [PATCH] Update git-npm-jupyter.py

---
 git-npm-jupyter.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/git-npm-jupyter.py b/git-npm-jupyter.py
index c5c71a5..a751984 100644
--- a/git-npm-jupyter.py
+++ b/git-npm-jupyter.py
@@ -16,7 +16,10 @@ git rm -r --cached mydir  //删除mydir文件夹，-n 即为展示不删除
 
 git fetch --all //指令是下载远程仓库最新内容，不做合并
 git reset --hard origin/master  //指令把HEAD指向master最新版本
-git pull //合并
+git pull //强行合并
+git fetch //下载远程仓库内容/（不同的下载，相同的留下）兼容
+git merge //合并
+
 
 git remote set-url origin repo.git //修改远程仓库地址