请!我失去了一天的工作。
我创建了一个github存储库..。我一整天都在做git、添加、-A和提交,但是我从来没有做过任何努力。我在页面上直接更改了一个自述文件(不知道合并这些分支会有问题)。
当我试图在一天的韩国之后努力推动时,发生了以下情况:
To https://github.com/NEGU93/Steganography.git
! [rejected] master -> master (fetch first)
error: failed to push some refs to 'https://github.com/NEGU93/Steganography.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.所以我尝试了ta git pull --rebase,但是它开始崩溃,我不知道它是什么:
remote: Counting objects: 3, done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (3/3), done.
From https://github.com/NEGU93/Steganography
6161279..44d1f0f master -> origin/master
0 [main] expr 8516 open_stackdumpfile: Dumping stack trace to expr.exe.stackdump
0 [main] cat 15632 open_stackdumpfile: Dumping stack trace to cat.exe.stackdump
0 [main] rm 4660 open_stackdumpfile: Dumping stack trace to rm.exe.stackdump
^C我让ctrl+C来阻止撞车。于是,我做了一个git fetch,然后把我的工作推到了git上:
fatal: You are not currently on a branch.
To push the history leading to the current (detached HEAD)
state now, use
git push origin HEAD:<name-of-remote-branch>于是我照建议做了,向师父推了一推:
git push origin HEAD:master
Counting objects: 6, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (5/5), done.
Writing objects: 100% (5/5), 1.49 KiB | 0 bytes/s, done.
Total 5 (delta 1), reused 0 (delta 0)
remote: Resolving deltas: 100% (1/1), done.
To https://github.com/NEGU93/Steganography.git
44d1f0f..c3b8393 HEAD -> master但现在当我回来的时候工作不在那里..。帮助!我不知道该怎么办,我开始恐慌了。我想问题就出在吉特的抓取上。有办法把我所有的工作都拿回来吗?
发布于 2017-07-06 04:18:25
使用git reflog查看过去的提交,然后使用提交的哈希进行硬重置,例如:
git reset --hard e870e41https://stackoverflow.com/questions/44939703
复制相似问题