Git pull——取分支整合

切换分支

$ git checkout -b lry
Switched to a new branch 'lry'
M       pom.xml
M       src/main/resources/application.properties

$ git status
On branch lry
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:   pom.xml
        modified:   src/main/resources/application.properties

Untracked files:
  (use "git add <file>..." to include in what will be committed)

        bin/
        src/main/java/com/example/controller/FileController.java
        src/main/java/com/example/repository/
        src/main/java/com/example/service/

no changes added to commit (use "git add" and/or "git commit -a")

$ git add .

$ git commit -m 'lry'
[lry 7494195] lry
 31 files changed, 9693 insertions(+)
 create mode 100644 bin/.gitignore
 create mode 100644 bin/.mvn/wrapper/maven-wrapper.jar
 create mode 100644 bin/.mvn/wrapper/maven-wrapper.properties
 create mode 100644 bin/README.md
 create mode 100644 bin/client/demo.html
 create mode 100644 bin/client/demo.js
 create mode 100644 bin/mvnw
 create mode 100644 bin/mvnw.cmd
 create mode 100644 bin/pom.xml
 create mode 100644 bin/src/main/java/HelloWorld.class
 create mode 100644 bin/src/main/java/com/example/WebdemoApplication.class
 create mode 100644 bin/src/main/java/com/example/config/WebMvcConfig.class
 create mode 100644 bin/src/main/java/com/example/config/WebSocketConfig.class
 create mode 100644 bin/src/main/java/com/example/controller/WsController.class
 create mode 100644 bin/src/main/java/com/example/model/dto/input/RequestMessage.class
 create mode 100644 bin/src/main/java/com/example/model/dto/output/ResponseMessage.class
 create mode 100644 bin/src/main/resources/application.properties
 create mode 100644 bin/src/main/resources/static/jquery.js
 create mode 100644 bin/src/main/resources/static/sockjs.min.js
 create mode 100644 bin/src/main/resources/static/stomp.min.js
 create mode 100644 bin/src/main/resources/templates/ws.html
 create mode 100644 bin/src/test/java/com/example/demo/WebdemoApplicationTests.class
 create mode 100644 src/main/java/com/example/controller/FileController.java
 create mode 100644 src/main/java/com/example/repository/FileRepository.java
 create mode 100644 src/main/java/com/example/repository/UserRepository.java
 create mode 100644 src/main/java/com/example/service/FileService.java
 create mode 100644 src/main/java/com/example/service/UserService.java
 create mode 100644 src/main/java/com/example/service/impl/FileServiceImpl.java
 create mode 100644 src/main/java/com/example/service/impl/UserServiceImpl.java

$ git push origin lry
Counting objects: 46, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (36/36), done.
Writing objects: 100% (46/46), 7.88 KiB | 1008.00 KiB/s, done.
Total 46 (delta 6), reused 0 (delta 0)
remote:
remote: To create a merge request for lry, visit:
remote:   https://codehub.devcloud.huaweicloud.com/codehub/312436/newmerge
remote:
To codehub.devcloud.huaweicloud.com:9f3a9d6e0c744bb4b62b011b78cf6bc5/Niners.git
 * [new branch]      lry -> lry

切换到master分支

$ git checkout master
Switched to branch 'master'
Your branch is behind 'origin/master' by 3 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)

$ git pull origin master
From codehub.devcloud.huaweicloud.com:9f3a9d6e0c744bb4b62b011b78cf6bc5/Niners
 * branch            master     -> FETCH_HEAD
Updating 7d69f4b..be60bd2
Fast-forward
 pom.xml                                            | 19 +++++++++++++
 .../com/example/controller/AdminController.java    |  7 +++++
 .../com/example/controller/FileController.java     |  9 ++++++
 .../com/example/controller/UserController.java     |  7 +++++
 .../java/com/example/service/ChangeSetService.java |  7 +++++
 src/main/java/com/example/service/FileService.java |  7 +++++
 .../com/example/service/UserEditFileService.java   |  7 +++++
 src/main/java/com/example/service/UserService.java | 11 ++++++++
 .../example/service/impl/ChangeSetServiceImpl.java |  7 +++++
 .../com/example/service/impl/FileServiceImpl.java  |  7 +++++
 .../service/impl/UserEditFileServiceImpl.java      |  7 +++++
 .../com/example/service/impl/UserServiceImpl.java  | 32 ++++++++++++++++++++++
 test.txt                                           |  0
 13 files changed, 127 insertions(+)
 create mode 100644 src/main/java/com/example/controller/AdminController.java
 create mode 100644 src/main/java/com/example/controller/FileController.java
 create mode 100644 src/main/java/com/example/controller/UserController.java
 create mode 100644 src/main/java/com/example/service/ChangeSetService.java
 create mode 100644 src/main/java/com/example/service/FileService.java
 create mode 100644 src/main/java/com/example/service/UserEditFileService.java
 create mode 100644 src/main/java/com/example/service/UserService.java
 create mode 100644 src/main/java/com/example/service/impl/ChangeSetServiceImpl.java
 create mode 100644 src/main/java/com/example/service/impl/FileServiceImpl.java
 create mode 100644 src/main/java/com/example/service/impl/UserEditFileServiceImpl.java
 create mode 100644 src/main/java/com/example/service/impl/UserServiceImpl.java
 create mode 100644 test.txt