Git添加远程仓库出现问题记录

问题描述
1.在github上新建一个仓库test，添加了readme、license和ignore文件
2.在本地git init
git add
git commit
3.添加远程仓库关联到本地
git remote add origin git@github.com:nopear1/test.git
4.git push origin master
这里就提示失败了
error: failed to push some refs to ‘git@github.com:nopear1/watch.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.
原因：本地和远端存在冲突

解决办法
5.git pull origin master --allow-unrelated-histories //使用这个指令，来把远程仓库和本地同步，消除两个文档间的差异，其实也就是把远端文件下载下来
6.git add ,
7.Git commit
8.Git push origin master
这样就解决了