From 3a43670e5237b7ffc1d1757b8a2d7d169a6933ea Mon Sep 17 00:00:00 2001 From: mengshukeji Date: Thu, 19 Nov 2020 11:06:46 +0800 Subject: [PATCH] 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 @@
- +