远程仓库提交代码的时候出现
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.
这几条错误信息。
意思是远程仓库和本地仓库文件不一致，也就是冲突了，
该如何解决/
- 强制提交
git push -f myremote master - 同步完之后提交
git pull myremote master
git push myremote master - 创建新分支new然后在新分支上提交
git branch new
git push myremote new