您的分支比“源/主”提前5次提交。如何还原不存在的

时间:2018-07-20 11:18:28

标签: github version-control versioning github-for-windows

我正在使用Windows。我使用git并将更改推送到GitHub存储库。 当我检查状态时,会收到以下消息:

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

nothing to commit, working tree clean

我拉起GitHub存储库以摆脱消息:

From https://github.com/my-user/my-proj
 * branch            master     -> FETCH_HEAD
Already up to date.

但是没有希望。当我尝试后拉推以确保我与刚刚拉出的版本内联时,出现此错误:

C:\Users\my-user\Documents\GitHub\my-project\data>git push origin master
Counting objects: 42, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (38/38), done.
Writing objects: 100% (42/42), 1.44 GiB | 1.63 MiB/s, done.
Total 42 (delta 6), reused 0 (delta 0)
remote: Resolving deltas: 100% (6/6), done.
remote: error: GH001: Large files detected. You may want to try Git Large File Storage - https://git-lfs.github.com.
remote: error: Trace: 9eaa1042
remote: error: See http://git.io/iEPt8g for more information.
remote: error: File data/problematic-folder/study/large-file.csv.7z is 306.16 MB; this exceeds GitHub's file size limit of 100.00 MB
remote: error: File ddata/problematic-folder/study/large-file-2.7z is 336.25 MB; this exceeds GitHub's file size limit of 100.00 MB
remote: error: File data/problematic-folder/study/large-file-3.csv is 900.49 MB; this exceeds GitHub's file size limit of 100.00 MB
remote: error: File data/problematic-folder/study/large-file-4.csv is 987.92 MB; this exceeds GitHub's file size limit of 100.00 MB
To https://github.com/my-user/my-project.git
 ! [remote rejected] master -> master (pre-receive hook declined)
error: failed to push some refs to 'https://github.com/my-user/my-project.git'

我再也看不到问题文件夹了。我试图将其删除。然后我从Windows系统中手动将其删除。

看到错误后我甚至尝试使用rm -f

git rm -f data/problematic-folder/\\*

但我收到错误消息:

fatal: pathspec 'data/problematic-folder/\\*' did not match any files

我想摆脱此消息。我需要在master分支内联git我的工作目录。请帮忙!

0 个答案:

没有答案