git常用命令以及提交步骤

1.更新代码 git pull origin dev
2.提交代码步骤
(1)git status 查看文件状态
(2)git add . 将文件加入提交队列
(3)git commit -m ‘本次修改内容’
(4)git push origin dev 将本地代码推送到服务器
3.代码冲突解决
(1)git stash 将本地代码加入缓存
(2)git pull origin dev 拉去服务器代码
(3)git stash pop 将最近一次的缓存弹出
(4)查看冲突文件并解决，提交代码
4.问题
(1)git config --global core.autocrlf false 对待换行符的方式
warning: LF will be replaced by CRLF in web/debug.log.
(2).git reset --hard FETCH_HEAD 从（dev|MERGIN）切到dev分支
(3)git reflog 查看提交版本
(4)git reset --hard 版本号 版本回滚
Git push时 ! [rejected] hinterror $ git pull --rebase origin dev再push

5.pull遇到错误：error: Your local changes to the following files would be overwritten by merge
一、保留本地的修改同时又把远程的合并过来
git stash 备份当前的工作区的内容
git pull origin master
git stash pop 从Git栈中读取最近一次保存的内容，恢复工作区的相关内容
二、放弃本地修改，直接覆盖
1 git reset --hard
2 git pull

5.$ git push origin dev # 结果如下

To github.com:hello/demo.git
! [rejected] master -> master (fetch first)
hinterror: failed to push some refs to ‘git@github.com:hello/demo.git’
: 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.

要解决以上问题，不再出现自动生成的 merge commit，那么只要在执行 git pull origin master 的时候带上 --rebase 即可：
$ git pull --rebase origin dev
$ git push origin dev