From 69aa3b8e651d5ab4f8f47a539e793595739aafce Mon Sep 17 00:00:00 2001
From: renxxing <74659302+renxxing@users.noreply.github.com>
Date: Thu, 19 Nov 2020 10:25:08 +0800
Subject: [PATCH 1/5] test
---
src/index.html | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/index.html b/src/index.html
index c06e76d..326ac08 100644
--- a/src/index.html
+++ b/src/index.html
@@ -141,6 +141,7 @@
"tb":2,
"v":"",
"qp":1,
+ // 1
}
},
{"r":17,"c":2,"v":{"v":"Luckysheet","ct":{"fa":"General","t":"g"},"bg":null,"bl":0,"it":0,"ff":0,"fs":"11","fc":"rgb(51, 51, 51)","ht":1,"vt":1,"m":"Luckysheet"}}
From 13ed1eb1f37dd8f54e91ce036659999d1a1743d6 Mon Sep 17 00:00:00 2001
From: renxxing <74659302+renxxing@users.noreply.github.com>
Date: Thu, 19 Nov 2020 10:39:50 +0800
Subject: [PATCH 2/5] test
---
src/index.html | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/index.html b/src/index.html
index 326ac08..c06e76d 100644
--- a/src/index.html
+++ b/src/index.html
@@ -141,7 +141,6 @@
"tb":2,
"v":"",
"qp":1,
- // 1
}
},
{"r":17,"c":2,"v":{"v":"Luckysheet","ct":{"fa":"General","t":"g"},"bg":null,"bl":0,"it":0,"ff":0,"fs":"11","fc":"rgb(51, 51, 51)","ht":1,"vt":1,"m":"Luckysheet"}}
From ffa77bbba7e671a5b8f39c2d951e573d5527eedb Mon Sep 17 00:00:00 2001
From: renxxing <74659302+renxxing@users.noreply.github.com>
Date: Thu, 19 Nov 2020 11:01:56 +0800
Subject: [PATCH 3/5] test
---
src/index.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/index.html b/src/index.html
index c06e76d..3eadc5a 100644
--- a/src/index.html
+++ b/src/index.html
@@ -21,7 +21,7 @@
-
+
From 3a43670e5237b7ffc1d1757b8a2d7d169a6933ea Mon Sep 17 00:00:00 2001
From: mengshukeji
Date: Thu, 19 Nov 2020 11:06:46 +0800
Subject: [PATCH 4/5] docs(readme): update
test conflict in index.html
---
deploy.bat | 33 ++++++++++++++++++++++++++++++++-
src/index.html | 2 +-
2 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/deploy.bat b/deploy.bat
index fe7a61f..383b483 100644
--- a/deploy.bat
+++ b/deploy.bat
@@ -51,4 +51,35 @@ git branch -a
git push origin --delete dev
git checkout master
# delete local branch
-git branch -d dev
\ No newline at end of file
+git branch -d dev
+
+# pr
+## 1. fork 到自己的仓库
+
+## 2. git clone 到本地
+
+## 3. 上游建立连接
+git remote add upstream https://github.com/mengshukeji/Luckysheet.git
+
+## 4. 创建开发分支
+git checkout -b dev
+
+## 5. 修改提交代码
+git add .
+git commit -m "add"
+git push origin dev
+
+## 6. 同步代码，将最新代码同步到本地
+git fetch upstream
+git rebase upstream/master
+
+## 7. 如果有冲突（没有可以略过）
+git status # 查看冲突文件，并修改冲突
+git add .
+git rebase --continue
+
+## 8.提交分支代码
+git push origin dev
+
+## 7. 提交pr
+去自己github仓库对应fork的项目下new pull request
\ No newline at end of file
diff --git a/src/index.html b/src/index.html
index c06e76d..9142e86 100644
--- a/src/index.html
+++ b/src/index.html
@@ -21,7 +21,7 @@
-
+
From fbd4f865a47be70beeaf713ed745f5b4cc5b030e Mon Sep 17 00:00:00 2001
From: renxxing <74659302+renxxing@users.noreply.github.com>
Date: Thu, 19 Nov 2020 11:01:56 +0800
Subject: [PATCH 5/5] test
---
src/index.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/index.html b/src/index.html
index 9142e86..3eadc5a 100644
--- a/src/index.html
+++ b/src/index.html
@@ -21,7 +21,7 @@
-
+