Git常用命令

最新推荐文章于 2026-06-24 19:16:15 发布
原创最新推荐文章于 2026-06-24 19:16:15 发布 · 403 阅读
0 ·
本内容遵循CC 4.0 BY-SA版权协议
收录于
Git
本文记录了一次Git中分支合并过程中的冲突解决步骤，包括切换分支、拉取最新代码、自动合并文件、解决合并冲突及最终提交更改等内容。通过具体操作展示了如何有效地处理代码合并过程中出现的各种问题。
(lry_adminGetUserInfo)
$ git checkout develop
Switched to a new branch 'develop'
Branch 'develop' set up to track remote branch 'develop' from 'origin'.

(develop)
$ git pull
Already up to date.

(develop)
$ git checkout
Your branch is up to date with 'origin/develop'.

(develop)
$ git checkout lry_adminGetUserInfo
Switched to branch 'lry_adminGetUserInfo'

(lry_adminGetUserInfo)
$ git merge develop
Removing src/test/java/usertests/UserServiceGetNoticeTest.java
Removing src/main/resources/static/user_login.html
Auto-merging src/main/resources/static/user/userinfo.html
Auto-merging src/main/resources/static/user/login.html
Auto-merging src/main/resources/static/user/home.html
Auto-merging src/main/resources/static/user/filemgr.html
Removing src/main/resources/static/register.html
Removing src/main/resources/static/password_modification.html
Removing src/main/resources/static/password_get_back.html
Auto-merging src/main/resources/static/admin/userinfo.html
Auto-merging src/main/resources/static/admin/sendmsg.html
Auto-merging src/main/resources/static/admin/login.html
Auto-merging src/main/resources/static/admin/home.html
Auto-merging src/main/java/com/niners/service/impl/UserServiceImpl.java
CONFLICT (content): Merge conflict in src/main/java/com/niners/service/impl/UserServiceImpl.java
Auto-merging src/main/java/com/niners/service/UserService.java
Auto-merging src/main/java/com/niners/controller/AdminController.java
Automatic merge failed; fix conflicts and then commit the result.

(lry_adminGetUserInfo|MERGING)
$ grep -Rn "<<<<"

(lry_adminGetUserInfo|MERGING)
$ git status
On branch lry_adminGetUserInfo
You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Changes to be committed:

        new file:   lib/javax.annotation.jar
        new file:   lib/javax.ejb.jar
        new file:   lib/javax.jms.jar
        new file:   lib/javax.persistence.jar
        new file:   lib/javax.resource.jar
        new file:   lib/javax.servlet.jar
        new file:   lib/javax.servlet.jsp.jar
        new file:   lib/javax.servlet.jsp.jstl.jar
        new file:   lib/javax.transaction.jar
        new file:   out/production/main/com/niners/model/dto/input/RequestMessage.java~871fc51d43d695254b3fc1db837dee503153a90f
        new file:   out/production/main/com/niners/model/dto/input/RequestMessage.java~HEAD
        new file:   src/applicationContext.xml
        modified:   src/main/java/com/niners/controller/AdminController.java
        modified:   src/main/java/com/niners/controller/UserController.java
        modified:   src/main/java/com/niners/model/entity/Admin.java
        modified:   src/main/java/com/niners/model/entity/File.java
        modified:   src/main/java/com/niners/repository/NoticeRepository.java
        modified:   src/main/java/com/niners/service/NoticeService.java
        modified:   src/main/java/com/niners/service/UserService.java
        modified:   src/main/java/com/niners/service/impl/UserEditFileServiceImpl.java
        new file:   src/main/java/com/niners/utils/FileUtils.java
        renamed:    src/main/resources/static/administratorHomepage.html -> src/main/resources/static/admin/home.html
        renamed:    src/main/resources/static/administrator_login.html -> src/main/resources/static/admin/login.html
        renamed:    src/main/resources/static/sendMessage.html -> src/main/resources/static/admin/sendmsg.html
        renamed:    src/main/resources/static/userManagement.html -> src/main/resources/static/admin/userinfo.html
        modified:   src/main/resources/static/assets/js/admin.js
        modified:   src/main/resources/static/assets/js/scripts.js
        modified:   src/main/resources/static/assets/js/user.js
        modified:   src/main/resources/static/jquery.js
        deleted:    src/main/resources/static/password_get_back.html
        deleted:    src/main/resources/static/password_modification.html
        deleted:    src/main/resources/static/register.html
        new file:   src/main/resources/static/user/changepwd.html
        renamed:    src/main/resources/static/fileManagement.html -> src/main/resources/static/user/filemgr.html
        renamed:    src/main/resources/static/userHomepage.html -> src/main/resources/static/user/home.html
        renamed:    src/main/resources/static/login.html -> src/main/resources/static/user/login.html
        new file:   src/main/resources/static/user/register.html
        new file:   src/main/resources/static/user/retrievepwd.html
        renamed:    src/main/resources/static/userInformation.html -> src/main/resources/static/user/userinfo.html
        deleted:    src/main/resources/static/user_login.html
        new file:   src/test/java/filetests/FileControllerCreateFileTest.java
        new file:   src/test/java/filetests/FileControllerDeleteFileTest.java
        new file:   src/test/java/filetests/FileControllerGetAuthorizationTest.java
        new file:   src/test/java/filetests/FileControllerRenameFileTest.java
        new file:   src/test/java/filetests/FileControllerUpdateFileTest.java
        new file:   src/test/java/filetests/FileServiceBackVersionTest.java
        new file:   src/test/java/filetests/FileServiceChangeFileAuthorizationTest.java
        new file:   src/test/java/filetests/FileServiceCheckUserFileTest.java
        new file:   src/test/java/filetests/FileServiceCreateFileTest.java
        new file:   src/test/java/filetests/FileServiceDeleteFileTest.java
        new file:   src/test/java/filetests/FileServiceGetAuthorizationTest.java
        new file:   src/test/java/filetests/FileServiceGetFileContentTest.java
        new file:   src/test/java/filetests/FileServiceGetFileInfoTest.java
        new file:   src/test/java/filetests/FileServiceGetLinkTest.java
        new file:   src/test/java/filetests/FileServiceRenameFileTest.java
        new file:   src/test/java/filetests/FileServiceUpdateFileTest.java
        new file:   src/test/java/usertests/NoticeServiceGetNoticeTest.java
        new file:   src/test/java/usertests/UserControllerChangePasswordTest.java
        new file:   src/test/java/usertests/UserControllerChangeUserInfoTest.java
        new file:   src/test/java/usertests/UserControllerGetNoticeTest.java
        new file:   src/test/java/usertests/UserControllerGetUserFileTest.java
        new file:   src/test/java/usertests/UserControllerGetUserInfoTest.java
        modified:   src/test/java/usertests/UserControllerLoginTest.java
        new file:   src/test/java/usertests/UserControllerRegisterTest.java
        modified:   src/test/java/usertests/UserEditFileServiceGetUserFileTest.java
        modified:   src/test/java/usertests/UserServiceChangePasswordTest.java
        modified:   src/test/java/usertests/UserServiceChangeUserInfoTest.java
        deleted:    src/test/java/usertests/UserServiceGetNoticeTest.java
        modified:   src/test/java/usertests/UserServiceGetUserInfoTest.java
        modified:   src/test/java/usertests/UserServiceLoginTest.java
        modified:   src/test/java/usertests/UserServiceRegisterTest.java
        new file:   src/test/java/usertests/UserServiceTest.java
        new file:   src/test/resources/application.properties

Unmerged paths:
  (use "git add <file>..." to mark resolution)

        both modified:   src/main/java/com/niners/service/impl/UserServiceImpl.java


(lry_adminGetUserInfo|MERGING)
$ git add .

(lry_adminGetUserInfo|MERGING)
$ git commit -m "fix merge conflict"
[lry_adminGetUserInfo d9ee1eb] fix merge conflict

(lry_adminGetUserInfo)
$ git status
On branch lry_adminGetUserInfo
nothing to commit, working tree clean

(lry_adminGetUserInfo)
$ git checkout develop
Switched to branch 'develop'
Your branch is up to date with 'origin/develop'.

(develop)
$ git merge lry_adminGetUserInfo
Updating 511c625..d9ee1eb
Fast-forward
 .../com/niners/controller/AdminController.java     | 26 ++++++++++++++++++++++
 .../java/com/niners/controller/FileController.java | 16 +++++++++++++
 src/main/java/com/niners/service/FileService.java  |  4 ++--
 src/main/java/com/niners/service/UserService.java  |  8 +++++++
 .../com/niners/service/impl/FileServiceImpl.java   |  2 +-
 .../com/niners/service/impl/UserServiceImpl.java   | 16 ++++++++++++-
 6 files changed, 68 insertions(+), 4 deletions(-)

(develop)
$ git push origin develop
Counting objects: 13, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (12/12), done.
Writing objects: 100% (13/13), 1.29 KiB | 1.29 MiB/s, done.
Total 13 (delta 8), reused 0 (delta 0)
remote:
remote: To create a merge request for develop, visit:
remote:   https://codehub.devcloud.huaweicloud.com/codehub/312436/newmerge
remote:
To codehub.devcloud.huaweicloud.com:9f3a9d6e0c744bb4b62b011b78cf6bc5/Niners.git
   511c625..d9ee1eb  develop -> develop

(develop)
$ git checkout lry_adminGetUserInfo
Switched to branch 'lry_adminGetUserInfo'
git_model 图片转自网络
标签
#Git