2.在terminl窗口中依次输入命令:
git pull
git pull origin master
git pull origin master --allow-unrelated-histories
如果还是提交不了可以试试下面这行代码
git push -u origin master -f
en by merge:
.idea/vcs.xml
F:\Daluzy\FirstGram>git push -u origin master -f
Enumerating objects: 74, done.
Counting objects: 100% (74/74), done.
Delta compression using up to 6 threads
Compressing objects: 100% (56/56), done.
Writing objects: 100% (74/74), 141.34 KiB | 11.78 MiB/s, done.
Total 74 (delta 0), reused 0 (delta 0), pack-reused 0
remote: Powered by GITEE.COM [GNK-6.0]
To https://gitee.com/daluzy/first-gram.git
+ 9012d63...d640621 master -> master (forced update)
Branch 'master' set up to track remote branch 'master' from 'origin'.