Username for '': ATM006
Password for 'https://ATM006@':
To /ATM006/
! [rejected] master -> master (fetch first)
error: failed to push some refs to '/ATM006/'
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: (., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
1、在使用git 对源代码进行push到gitHub时可能会出错
2、出现错误的主要原因是github中的文件不在本地代码目录中
3、可以通过如下命令进行代码合并【注：pull=fetch+merge]
git pull --rebase origin master
4、执行上面代码后可以看到本地代码库中多了文件
5、此时再执行语句 git push 即可完成代码上传到github