我从不同的分支切换，所以我可以推动。在结帐时，我的编辑器中的文件已打开，这可能导致权限被拒绝错误。 git丢失了我的所有文件吗？我不知道如何让他们回来。这是我做的 -
文件丢失了
js/Messages目录
templates/Messages目录
当我在进行git操作时，这些在我的编辑器中打开了
C:\Users\***\Documents\myproject>git pull
Password for 'https://********@bitbucket.org':
Already up-to-date.
C:\Users\***\Documents\myproject>git checkout paymentmodule
error: cannot stat 'www/js/Messages': Permission denied
error: cannot stat 'www/js/Messages': Permission denied
error: cannot stat 'www/templates/Messages': Permission denied
C:\Users\***\Documents\myproject>git checkout paymentmodule
Switched to branch 'paymentmodule'
C:\Users\***\Documents\myproject>git push origin paymentmodule
Password for 'https://******@bitbucket.org':
To https://*******@bitbucket.org/********/myproject.git
! [rejected] paymentmodule -> paymentmodule (non-fast-forward)
error: failed to push some refs to 'https://********@bitbucket.org/********/myproject.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.
//THIS STEP WAS A MISTAKE
C:\Users\***\Documents\myproject>git fetch origin paymentmodule
Password for 'https://********@bitbucket.org':
From https://bitbucket.org/***********/myproject
* branch paymentmodule -> FETCH_HEAD
//This was what i wanted to do so I did it without reverting my previous step
C:\Users\***\Documents\myproject>git fetch origin paymentmodule:tmp
Password for 'https://**********@bitbucket.org':
From https://bitbucket.org/*******/myproject
* [new branch] paymentmodule -> tmp
C:\Users\***\Documents\myproject>git rebase tmp
First, rewinding head to replay your work on top of it...
warning: unable to access 'www/templates/Messages/.gitattributes': Permission denied
warning: unable to access 'www/templates/Messages/.gitattributes': Permission denied
warning: unable to access 'www/templates/Messages/.gitattributes': Permission denied
warning: unable to access 'www/templates/Messages/.gitattributes': Permission denied
Applying: Implement chat services
warning: unable to access 'www/templates/Messages/.gitattributes': Permission denied
Using index info to reconstruct a base tree...
.git/rebase-apply/patch:63: trailing whitespace.
For instructions on this, start with the
.git/rebase-apply/patch:586: trailing whitespace.
#
.git/rebase-apply/patch:588: trailing whitespace.
#
.git/rebase-apply/patch:613: trailing whitespace.
.git/rebase-apply/patch:759: trailing whitespace.
warning: unable to access 'www/templates/Messages/.gitattributes': Permission denied
warning: squelched 348 whitespace errors
warning: 353 lines add whitespace errors.
Falling back to patching base and 3-way merge...
error: cannot stat 'www/templates/Messages': Permission denied
error: Failed to merge in the changes.
Patch failed at 0001 Implement chat services
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".
//This was a mistake too
C:\Users\***\Documents\myproject>git rebase --skip
C:\Users\***\Documents\myproject>git rebase --abort
No rebase in progress?
修改
我使用以下输出再运行一个命令。我不确定这意味着什么
C:\Users\***\Documents\myproject>git fsck --no-reflog
Checking object directories: 100% (256/256), done.
dangling blob 8860babe2931ea1e9dbafaa589e7c4feb19f14c7
dangling commit 1da3053dbe12d11e4ae65dc3a2ba720c9b272b7b
dangling commit cd03cd391e3447be272d3b8307ddb49cd3de1189
dangling blob c9648cae0b45ef174fa88aa5ad6b9008085a9766
dangling blob 2bc76e285d27d6979cf47148711e7c91379910c8
dangling blob 410f4c2f02192a56a9d4c0f01e847d85276799b4
dangling commit 60b1d2f1e2b7f8bfa42d4d2f49857a1b66db8575
dangling blob 949297fe49f427065fe0e74568af852e2796cc19
dangling commit 50d44e0896b10d461629fc5bffe60ee26996d433
dangling commit a8d4aa02b375cb3e04b90033a1a9d17697f6583d
dangling commit f5b5c1a66f450010f30c352caa3baa2f5a3b6576
dangling blob 5af70169556610abe956f748dc25af77494cc06e
dangling blob 981d6a55406d8b2ec63f0952ac65ad1afc893d8a
dangling commit d61db3516d2bbaf24efcf3fe9b644823bdc4a7ff
我是否必须再次编写整个代码！？
答案 0 :(得分：3)
在聊天中进行了长时间的讨论之后，事实证明你之前的提交（带有日志消息＆＃34;实施聊天服务＆＃34;仍然可以在reflog中看到。）你在问题中说过它不是＆＃39 ;但是，你只是错过了看到它。）所以你需要做的事情（已经完成，正如我从聊天中所知）：
git reflog
reflog中约有十行，您将看到＆＃34; a8d4aa0 HEAD @ {12}：commit：实施聊天服务＆＃34;。所以你需要的提交哈希是a8d4aa0。现在你可以做到：
git checkout -b new-branch-name a8d4aa0
现在，您的提交在新分支上是安全的，并且可以根据需要进行合并或重新定位。
顺便说一句，它也可以通过git fsck --no-reflog找到;当你说'＃34;不幸的是，这些提交是旧的提交，我认为在我失去的那些之前就已经开始了＃34;你刚刚放弃了。这是您发布的git fsck --no-reflog输出中的一行：
dangling commit a8d4aa02b375cb3e04b90033a1a9d17697f6583d
如果你运行了git show a8d4aa02b375cb3e04b90033a1a9d17697f6583d，那么你就会找到你的提交。
课程：在寻找丢失的提交时，永不放弃。永远不要投降。（谢谢， Galaxy Quest ！）