在GitHub上创建repository时初始化.gitignore和readme.md,在本地push出现冲突
$ git push origin master
To https://github.com/*******/shopping.git! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'https://github.com/*******/shopping.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.
解决方法:
1、使用强制push的方法:
$git push -u origin master -f(不建议该种解决办法,因为这会使远程库资料丢失,尤其在多人协作开发时更不可取)
2、push前先将远程repository修改pull下来
$ git pull origin master
$ git push -u origin master
3、若不想merge远程和本地修改,可以先创建新的分支:
$ git branch [name]
然后push
$ git push -u origin [name]