一.! [rejected] master -> master (non-fast-forward)
当把本地仓库和远程的空仓库关联起来后,把本地代码推到远程空仓库,出现:
To gitlab.botpy.xxx/xxx/xxx.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'git@gitlab.botpy.com:xxx/xxx/xxx.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
使用git pull --rebase origin master
二.warning: LF will be replaced by CRLF in
首先出现这个问题主要原因是:我们从别人github地址上通过git clone下载下来,而又想git push到我们自己的github上,那么就会出现上面提示的错误信息
此时需要执行如下代码:
git rm -r --cached .
git config core.autocrlf false
git add .
. 代表当前目录