github从远程库获取修改后提交

1. 将github上的下载到本地，解压缩
2. 在本地里面添加东西，git add，git commit，
3. 想要上传到远程git remote add origin https://github.com/egg53231323/helloWorld.git

4. 想要提交，输入git push -u origin master但出现错误: failed to push some refs to ‘https://github.com/egg53231323/helloWorld.git‘， hint: Updates were rejected because the remote contains work that you do not have locally. This is usually caused by another repository pushing to the same ref. You may want to first integrate the remote changes
   (e.g., ‘git pull …’) before pushing again.
   See the ‘Note about fast-forwards’ in ‘git push –help’ for details.

5. $ git branch –set-upstream-to=master

6. $ git pull –allow-unrelated-histories

7. $ git pull origin master
8. 查看本地目录会有从服务器得到的代码
9. 修改后，输入$git push -u origin master即可提交（我这里老是提交不上去第2步中添加的文件，最后看了看原来是从服务器得到的代码的地址和原来自己解压缩的地址不一样导致的，将添加文件拷贝到后来得的文件夹下并提交，把原来的删除即可）。