Git专题

赵宗义11

已于 2022-06-19 17:16:33 修改

阅读量650

点赞数

分类专栏： git 文章标签： git

于 2021-01-18 00:23:25 首次发布

本文链接：https://blog.csdn.net/nankai0912678/article/details/112760428

版权

这篇博客介绍了在Git中如何撤销误提交的大文件，处理拉取时的未合并文件错误，通过HTTPS克隆私有仓库，恢复仓库到历史版本，创建与切换分支及删除分支的详细步骤。内容涵盖Git日常操作中的常见问题和解决方案。

摘要由CSDN通过智能技术生成

文章目录

误提交大文件以后如何撤销?
error: Pulling is not possible because you have unmerged files.
我能在网页上打开github的仓库，但是克隆时却出错
将仓库恢复到一个之前的版本
新建一个分支并切换到这个分支，以及删除一个分支

误提交大文件以后如何撤销?

我有一个大小超过700MB的文件被错误地提交了, 结果导致git push的操作失败. 提示信息如下:

$ git push
Counting objects: 3, done.
Delta compression using up to 48 threads.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 243.27 MiB | 1.07 MiB/s, done.
Total 3 (delta 1), reused 1 (delta 0)
remote: Powered by GITEE.COM [GNK-5.0]
remote: error: File: 8e2f0e3a8257bf7483b7b8c56f6a92bd4a9b5427 291.63 MB, exceeds 100.00 MB.
remote: Use command below to see the filename:
remote: git rev-list --objects --all | grep 8e2f0e3a8257bf7483b7b8c56f6a92bd4a9b5427
remote: Please remove the file from history and try again. (https://gitee.com/help/articles/4232)
To https://gitee.com/zhao_zong_yi/pyzahui
 ! [remote rejected] master -> master (pre-receive hook declined)
error: failed to push some refs to 'https://gitee.com/zhao_zong_yi/pyzahui'
Makefile:2: recipe for target 'update' failed
make: *** [update] Error 1

通过参考此处, 我得到一个非常简洁高效的解决方案. 首先我们根据提示信息执行命令git rev-list --objects --all | grep 8e2f0e3a8257bf7483b7b8c56f6a92bd4a9b5427, 结果如下:

$ git rev-list --objects --all | grep 8e2f0e3a8257bf7483b7b8c56f6a92bd4a9b5427
8e2f0e3a8257bf7483b7b8c56f6a92bd4a9b5427 output.txt

可见, 导致我们上传失败的文件是output.txt, 因此我们简单地将这个文件删除.

之后, 我们执行命令git status:

$ git status
On branch master
Your branch is ahead of 'origin/master' by 1 commit.
  (use "git push" to publish your local commits)

Changes not staged for commit:
  (use "git add/rm <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

	deleted:    output.txt

no changes added to commit (use "git add" and/or "git commit -a")

其中的关键部分是Your branch is ahead of 'origin/master' by 1 commit., 即我们有1次提交未成功,