操作:
git add 杨辉三角.cpp
git commit -m"liu"
git push origin master
报错信息1:
To https://amc-msra.visualstudio.com/trading-algo/_git/real-trading
! [rejected] master -> dev-gaochao (fetch first)
error: failed to push some refs to 'https://amc-msra.visualstudio.com/trading-algo/_git/real-trading'
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.
原因:
之所以出现这个原因,是因为我add了以后又做了一些修改,和删除,所以线上线下就对不上了。
解决方法(合并):
git pull --rebase origin master
rebase分析:
这个命令做了以下内容:
a.把你 commit 到本地仓库的内容,取出来放到暂存区(stash)(这时你的工作区是干净的)
b.然后从远端拉取代码到本地,由于工作区是干净的,所以不会有冲突
c.从暂存区把你之前提交的内容取出来,跟拉下来的代码合并
报错信息2:
TUntracked files:
(use "git add <file>..." to include in what will be committed)
原因:
目录中有其它文件影响
解决方法:
我就是把没用的文件删了,然后用status看一下,重新弄就行,也可以用ignore来忽略这个错误