diff --git a/README.md b/README.md index e68f8d3..1bab957 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,16 @@ 线上部署gitea +### 关联线上库 - git remote add profile https://gitea.vlos.net/jafar.o.jeh/gitea_init.git - git pull profile main +### 更新线上库 - git add . - git commit -m "更新信息" - git push profile main + +### 合并分支,合并dev->main +- git checkout main #切换到 main 分支 +- git merge dev #令将分支dev合并到 main 分支 +- git merge --continue #解决合并冲突(如果需要) +- git add . && git push origin main # 正常更新main分支到线上 \ No newline at end of file