Git 文件管理

初始化一个新本地仓库

git init 

checkout 服务器文件

git clone file_path

如果报 HTTP Basic: Access denied错误

git config --system --unset credential.helper #重新输入账号密码

commit更新服务器文件

$ git push
$ git commit -a -m "comments"

Q1 git push出现以下问题

error: failed to push some refs to 'https://github.com/GDDXZ/RobotDenso.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.

原因
两人同时fetch了一个分支。 第一个人修改后提交，第二个人提交就失败。

解决方法
1.强制推送

$ git push -f

可以提交，会将remote上第一个人的改动冲掉，比较暴力，不太好。

2.正常解决

$ git fetch origin 
git merge origin/master #之后和本地分支合并

之后再push。