hint: not have locally. This is usually caused by another repository pushing
git 提交代码前先pull代码,否则会报如下错误
wangju@wangju-HP-348-G4:~/test/reponselogiccheck$ git status
On branch master
Your branch is ahead of 'origin/master' by 1 commit.
(use "git push" to publish your local commits)
nothing to commit, working tree clean
wangju@wangju-HP-348-G4:~/test/reponselogiccheck$ git push
To git.5i5j.com:kaifa/reponselogiccheck.git
! [rejected] master -> master (fetch first)
error: failed to push some refs to 'git@git.5i5j.com:kaifa/reponselogiccheck.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
wangju@wangju-HP-348-G4:~/test/reponselogiccheck$ git pull
remote: Enumerating objects: 5, done.
remote: Counting objects: 100% (5/5), done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 3 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (3/3), done.
From git.5i5j.com:kaifa/reponselogiccheck
2a5b889..e69bef2 master -> origin/master
Auto-merging a.py
CONFLICT (content): Merge conflict in a.py
Automatic merge failed; fix conflicts and then commit the result.
wangju@wangju-HP-348-G4:~/test/reponselogiccheck$ ls
a.py bb.py testGitlab
最新文章
- sockaddr和sockaddr_in的区别(转载)
- Linux下根据进程的名字杀死进程
- js 调用 android 安卓 代码
- mac上搭建appium+IOS自动化测试环境(一)
- ubuntu14.04系统中virtualbox安装Oracle VM VirtualBox Extension Pack包
- 作业二：Git的安装与使用
- C# Monitor实现
- Linux下通过管道杀死所有与tomcat相关的进程
- Tomcat8 启动中提示 org.apache.catalina.webresources.Cache.getResource Unable to add the resource
- eclipse闪退解决
- 【CF671E】Organizing a Race 单调栈+线段树
- PHP的垃圾回收
- OGG_GoldenGate日常监控（案例）
- 每日英语：Is Bo Xilai the Past or Future?
- 【BZOJ 3812】 3812: 主旋律 （容斥原理**）
- B. T-primes
- 让Tomcat供外网访问
- krpano之背景音乐
- css表格
- 每天一个Linux命令（13）：apt命令