git push 失败
原因是本地修改不是最新版本
解决方法:需要先将远程版本pull到本地进行merge
C:\Users\mjy\IdeaProjects\hhh>git push origin master
To https://gitee.com/mjygo/staffManagement.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'https://gitee.com/mjygo/staffManagement.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
merge失败
解决方法:将提示的conflict的文件git add,随后commit
C:\Users\mjy\IdeaProjects\hhh>git merge tmp
error: refusing to lose untracked file at 'vuedemo/vue.config.js'
error: refusing to lose untracked file at 'vuedemo/src/views/HomeView.vue'
error: refusing to lose untracked file at 'vuedemo/src/views/AboutView.vue'
error: refusing to lose untracked file at 'vuedemo/src/utils/request.js'
error: refusing to lose untracked file at 'vuedemo/src/store/index.js'
error: refusing to lose untracked file at 'vuedemo/src/router/index.js'
error: refusing to lose untracked file at 'vuedemo/src/main.js'
error: refusing to lose untracked file at 'vuedemo/src/components/MainPageComponents/TopBar.vue'
error: refusing to lose untracked file at 'vuedemo/src/components/MainPageComponents/StaffTable.vue'
error: refusing to lose untracked file at 'vuedemo/src/components/MainPageComponents/SideBar.vue'
error: refusing to lose untracked file at 'vuedemo/src/components/MainPageComponents/MainPage.vue'
error: refusing to lose untracked file at 'vuedemo/src/components/HelloWorld.vue'
error: refusing to lose untracked file at 'vuedemo/src/assets/logo.png'
error: refusing to lose untracked file at 'vuedemo/src/App.vue'
error: refusing to lose untracked file at 'vuedemo/public/index.html'
error: refusing to lose untracked file at 'vuedemo/public/favicon.ico'
error: refusing to lose untracked file at 'vuedemo/package.json'
error: refusing to lose untracked file at 'vuedemo/package-lock.json'
error: refusing to lose untracked file at 'vuedemo/jsconfig.json'
error: refusing to lose untracked file at 'vuedemo/babel.config.js'
error: refusing to lose untracked file at 'vuedemo/README.md'
error: refusing to lose untracked file at 'vuedemo/.gitignore'
error: refusing to lose untracked file at 'qd/vue.config.js'
error: refusing to lose untracked file at 'qd/src/main.js'
error: refusing to lose untracked file at 'qd/src/components/MainPageComponents/TopBar.vue'
error: refusing to lose untracked file at 'qd/src/components/MainPageComponents/StaffTable.vue'
error: refusing to lose untracked file at 'qd/src/components/MainPageComponents/SideBar.vue'
error: refusing to lose untracked file at 'qd/src/components/MainPageComponents/MainPage.vue'
error: refusing to lose untracked file at 'qd/src/components/LogInComponents/UserInfoPanel.vue'
error: refusing to lose untracked file at 'qd/src/components/LogInComponents/SubmitButton.vue'
error: refusing to lose untracked file at 'qd/src/components/LogInComponents/LogInPanel.vue'
error: refusing to lose untracked file at 'qd/src/components/HelloWorld.vue'
error: refusing to lose untracked file at 'qd/src/assets/logo.png'
error: refusing to lose untracked file at 'qd/src/assets/bg.JPG'
error: refusing to lose untracked file at 'qd/src/App.vue'
error: refusing to lose untracked file at 'qd/qd.iml'
error: refusing to lose untracked file at 'qd/public/index.html'
error: refusing to lose untracked file at 'qd/public/favicon.ico'
error: refusing to lose untracked file at 'qd/package.json'
error: refusing to lose untracked file at 'qd/package-lock.json'
error: refusing to lose untracked file at 'qd/jsconfig.json'
error: refusing to lose untracked file at 'qd/babel.config.js'
error: refusing to lose untracked file at 'qd/README.md'
error: refusing to lose untracked file at 'qd/.gitignore'
warning: Cannot merge binary files: aduc/target/classes/com/myProject/p1/controller/StaffController.class (HEAD vs. tmp)
Adding vuedemo/vue.config.js
Adding vuedemo/src/views/HomeView.vue
Adding vuedemo/src/views/AboutView.vue
Adding vuedemo/src/utils/request.js
Adding vuedemo/src/store/index.js
Adding vuedemo/src/router/index.js
Adding vuedemo/src/main.js
Adding vuedemo/src/components/MainPageComponents/TopBar.vue
Adding vuedemo/src/components/MainPageComponents/StaffTable.vue
Adding vuedemo/src/components/MainPageComponents/SideBar.vue
Adding vuedemo/src/components/MainPageComponents/MainPage.vue
Adding vuedemo/src/components/HelloWorld.vue
Adding vuedemo/src/assets/logo.png
Adding vuedemo/src/App.vue
Adding vuedemo/public/index.html
Adding vuedemo/public/favicon.ico
Adding vuedemo/package.json
Adding vuedemo/package-lock.json
Adding vuedemo/jsconfig.json
Adding vuedemo/babel.config.js
Adding vuedemo/README.md
Adding vuedemo/.gitignore
CONFLICT (file/directory): There is a directory with name vuedemo in tmp. Adding vuedemo as vuedemo~HEAD
Adding qd/vue.config.js
Adding qd/src/main.js
Adding qd/src/components/MainPageComponents/TopBar.vue
Adding qd/src/components/MainPageComponents/StaffTable.vue
Adding qd/src/components/MainPageComponents/SideBar.vue
Adding qd/src/components/MainPageComponents/MainPage.vue
Adding qd/src/components/LogInComponents/UserInfoPanel.vue
Adding qd/src/components/LogInComponents/SubmitButton.vue
Adding qd/src/components/LogInComponents/LogInPanel.vue
Adding qd/src/components/HelloWorld.vue
Adding qd/src/assets/logo.png
Adding qd/src/assets/bg.JPG
Adding qd/src/App.vue
Adding qd/qd.iml
Adding qd/public/index.html
Adding qd/public/favicon.ico
Adding qd/package.json
Adding qd/package-lock.json
Adding qd/jsconfig.json
Adding qd/babel.config.js
Adding qd/README.md
Adding qd/.gitignore
CONFLICT (file/directory): There is a directory with name qd in tmp. Adding qd as qd~HEAD
CONFLICT (add/add): Merge conflict in aduc/target/classes/com/myProject/p1/controller/StaffController.class
Auto-merging aduc/target/classes/com/myProject/p1/controller/StaffController.class
CONFLICT (add/add): Merge conflict in aduc/src/main/java/com/myProject/p1/controller/StaffController.java
Auto-merging aduc/src/main/java/com/myProject/p1/controller/StaffController.java
Automatic merge failed; fix conflicts and then commit the result.
C:\Users\mjy\IdeaProjects\hhh>git add vuedemo
C:\Users\mjy\IdeaProjects\hhh>git add qd
C:\Users\mjy\IdeaProjects\hhh>git add aduc
push成功
C:\Users\mjy\IdeaProjects\hhh>git commit -m"trying to solve conflicts"
[master 0dd9f83] trying to solve conflicts
C:\Users\mjy\IdeaProjects\hhh>git status
On branch master
nothing to commit, working tree clean
C:\Users\mjy\IdeaProjects\hhh>git push origin master
Enumerating objects: 70, done.
Counting objects: 100% (70/70), done.
Delta compression using up to 8 threads
Compressing objects: 100% (33/33), done.
Writing objects: 100% (49/49), 4.69 KiB | 70.00 KiB/s, done.
Total 49 (delta 20), reused 0 (delta 0)
remote: Powered by GITEE.COM [GNK-6.3]
To https://gitee.com/mjygo/staffManagement.git
65face4..0dd9f83 master -> master