使用Git上传项目代码到Gitee遇到的问题1

最新推荐文章于 2025-08-26 21:10:48 发布

原创最新推荐文章于 2025-08-26 21:10:48 发布 · 783 阅读

0 ·

CC 4.0 BY-SA版权

文章标签：

#git

ThinkPHP 专栏收录该内容

7 篇文章

订阅专栏

这篇博客介绍了在使用Git推送项目代码到Gitee时遇到的非快进合并错误。作者详细展示了从提示信息到解决该问题的完整步骤，包括尝试`git pull`，处理不相关的历史记录，最终使用`git push -u origin master -f`强制推送。通过这个过程，读者可以学习如何解决类似Git冲突的问题。

使用Git上传项目代码到Gitee遇到的问题

提示错误如下：

$ git push origin master
To gitee.com:chesnyhh/hcsgsal.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'gitee.com:chesnyhh/hcsgsal.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.

解决方法：

$ git pull   //1. 输入git pull
There is no tracking information for the current branch.
Please specify which branch you want to merge with.
See git-pull(1) for details.
    git pull <remote> <branch>
If you wish to set tracking information for this branch you can do so with:
    git branch --set-upstream-to=origin/<branch> master
    
$ git pull origin master  //2. 再输入git pull origin master
From gitee.com:chesnyhh/hcsgsal.git
 * branch            master     -> FETCH_HEAD
fatal: refusing to merge unrelated histories

$ git pull origin master --alow-unrelated-histories  //3. 再输入这行

$ git push -u origin master -f   //4. 最后输入这个代码  就可以上传项目代码
Enumerating objects: 105, done.
Counting objects: 100% (105/105), done.
Delta compression using up to 4 threads
Compressing objects: 100% (88/88), done.
Writing objects: 100% (105/105), 154.53 KiB | 1.91 MiB/s, done.
Total 105 (delta 24), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (24/24), done.
remote: Powered by GITEE.COM [GNK-5.0]
To gitee.com:chesnyhh/hcsgsal.git
 + 8161726...276a37e master -> master (forced update)
Branch 'master' set up to track remote branch 'master' from 'origin'.

完。。。