代码提交码云仓库

完成user的所有功能之后，需要提交今天的代码了。

1. 首先查看自己在那个分支
   命令：git branch

PS D:\bilibiliStudy\vue-admin> git branch
  login
 * master

反馈：发现在master分支上，我们不能直接推送到master主分支，我们需要有自己的分支user。

2. 创建自己的开发分支user，并且切换到user分支。
   命令：git checkout -b user

PS D:\bilibiliStudy\vue-admin> git checkout -b user
M       src/assets/css/global.css
A       src/assets/img/photo.jpg
M       src/components/Home.vue
A       src/components/Welcome.vue
M       src/components/tologin.vue
A       src/components/users/UserList.vue
M       src/main.js
M       src/plugins/element.js
M       src/router/index.js
Switched to a new branch 'user

3. 再次查看所处分支
   命令：git branch

PS D:\bilibiliStudy\vue-admin> git  branch
  login
  master
 *user

反馈：*代表所处分支为user

4. 检查当前分支文件状态
   命令：git status

PS D:\bilibiliStudy\vue-admin> git status
On branch user
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

        new file:   src/assets/img/photo.jpg
        modified:   src/components/Home.vue
        new file:   src/components/Welcome.vue
        modified:   src/components/tologin.vue
        new file:   src/components/users/UserList.vue
        modified:   src/main.js
        modified:   src/plugins/element.js
        modified:   src/router/index.js

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        modified:   src/assets/css/global.css
        modified:   src/components/Home.vue
        modified:   src/components/users/UserList.vue
        modified:   src/plugins/element.js

5.将修改的文件和新添加的文件添加到暂存区。
命令：git add .

反馈：再次检查状体，发现所有文件都被添加到暂存区。

PS D:\bilibiliStudy\vue-admin> git status
On branch user
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

        modified:   src/assets/css/global.css
        new file:   src/assets/img/photo.jpg
        modified:   src/components/Home.vue
        new file:   src/components/Welcome.vue
        modified:   src/components/tologin.vue
        new file:   src/components/users/UserList.vue
        modified:   src/main.js
        modified:   src/plugins/element.js
        modified:   src/router/index.js

6.将user分支提交到仓库中。
命令：git commit -m ‘完成用户功能的添加’

PS D:\bilibiliStudy\vue-admin> git commit -m '完成用户功能的添加'
[user 65be91e] 完成用户功能的添加
 9 files changed, 563 insertions(+), 15 deletions(-)
 create mode 100644 src/assets/img/photo.jpg
 create mode 100644 src/components/Welcome.vue
 create mode 100644 src/components/users/UserList.vue

查看：检查状态 运行 git status ，反馈：当前工作目录是干净的。

PS D:\bilibiliStudy\vue-admin> git status
On branch user
nothing to commit, working tree clean 

此时本地user仓库的代码是最新的

7.把本地的user分支提送到远端的码云中
命令： git push -u origin user（第一次提交），以后用命令：git push 即可。

PS D:\bilibiliStudy\vue-admin> git push -u origin user
Counting objects: 24, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (19/19), done.
Writing objects: 100% (24/24), 24.07 KiB | 0 bytes/s, done.
Total 24 (delta 9), reused 0 (delta 0)
remote: Powered by GITEE.COM [GNK-5.0]
remote: Create a pull request for 'user' on Gitee by visiting:
remote:     https://gitee.com/xu_yan_fei/vue-admin/pull/new/xu_yan_fei:user...xu_yan_fei:master
To https://gitee.com/xu_yan_fei/vue-admin.git
 * [new branch]      user -> user
Branch user set up to track remote branch user from origin.

此时本地的user分支和远端的user分支的代码是最新的，但是本地master分支和云端的master分支的代码不是最新的

8.将本地的user分支的代码合并到本地master分支，然后将本地master推送到云端。
（1）查看分支并且切换到master分支

PS D:\bilibiliStudy\vue-admin> git branch
  login
  master
* user
PS D:\bilibiliStudy\vue-admin> git checkout master
Switched to branch 'master'
Your branch is ahead of 'origin/master' by 1 commit.
  (use "git push" to publish your local commits)
PS D:\bilibiliStudy\vue-admin> git branch
  login
* master
  user

（2）从主分支合并user分支代码
命令：git merge user

PS D:\bilibiliStudy\vue-admin> git merge user
Updating 2a6a736..65be91e
Fast-forward
 src/assets/css/global.css         |  14 ++
 src/assets/img/photo.jpg          | Bin 0 -> 18264 bytes
 src/components/Home.vue           | 131 ++++++++++++++-
 src/components/Welcome.vue        |  19 +++
 src/components/tologin.vue        |   6 +-
 src/components/users/UserList.vue | 325 ++++++++++++++++++++++++++++++++++++++
 src/main.js                       |   7 +
 src/plugins/element.js            |  50 +++++-
 src/router/index.js               |  26 ++-
 9 files changed, 563 insertions(+), 15 deletions(-)
 create mode 100644 src/assets/img/photo.jpg
 create mode 100644 src/components/Welcome.vue
 create mode 100644 src/components/users/UserList.vue

此时本地master分支的代码是最新的，但是云端的master代码还是旧的

9.把本地的maser分支的代码推送到云端maser分支
命令：git push （这次不用-u 因为云端已经有master分支）

PS D:\bilibiliStudy\vue-admin> git push