diff --git a/README.md b/README.md index 9f61818fda6cae0beae354d444875f1a45e21129..2b468ac69980e4024bd6825afbf063034fa93ba5 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Spring 入门课程代码 2. 安装git -#### 使用说明 +#### 添加一个文件并提交到Gitee 根据https://www.runoob.com/manual/git-guide/ 这个,使用命令行,做如下操作: @@ -62,7 +62,7 @@ $ git commit -m "Git测试" create mode 100644 Test.txt ``` -5. 将文件推送到远程的develop分支() +5. 将文件推送到远程的develop分支 ```bash $ git push origin develop @@ -78,6 +78,47 @@ To https://gitee.com/SpringLearning/SpringBasic.git ``` +#### 修改文件并提交到Gitee + +1. 修改README.md,然后使用git管理 +```bash +$ git add README.md + +``` +2. 将文件提交到暂存区 +```bash +$ git commit -m "修改readme" + +[develop b68d113] 修改readme + 1 file changed, 66 insertions(+), 6 deletions(-) +``` + +3. 将文件推送到远程的develop分支 + +```bash +$ git push origin develop +Enumerating objects: 5, done. +Counting objects: 100% (5/5), done. +Delta compression using up to 4 threads +Compressing objects: 100% (3/3), done. +Writing objects: 100% (3/3), 1.63 KiB | 833.00 KiB/s, done. +Total 3 (delta 0), reused 0 (delta 0), pack-reused 0 +remote: Powered by GITEE.COM [GNK-3.8] +To https://gitee.com/SpringLearning/SpringBasic.git + 381c2fb..b68d113 develop -> develop +``` + + +#### 将develop分支代码合并到master分支 + +1. 直接将本地代码提交到master分支(不建议) +```bash +$ git push origin master + +``` +2. 通过网页端,提交merge request + + #### 参与贡献