docs(readme): update

test conflict in index.html
5 years ago · 3a43670e52
2 changed files with 33 additions and 2 deletions
--- 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
+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
--- a/src/index.html
+++ b/src/index.html
@ -21,7 +21,7 @@
 <body>
 	<div id="luckysheet" style="margin:0px;padding:0px;position:absolute;width:100%;height:100%;left: 0px;top: 0px;"></div>
-
+	<!-- 2 -->
 	<!-- demo feature, non-production use -->
 	<script src="./demoData/demoFeature.js"></script>