Git 本地合并搞砸了。 Gemfile消失并且rails服务器无法启动
在工作副本中与主服务器本地合并分支。合并后，切换回master显示HEAD，而不是之前的master。当使用 Rails Server 启动 Rails Server 时也会弹出错误，提示没有要加载的 bcrypt 文件。 Gemfile 也从根子目录中消失了。
运行捆绑安装并没有帮助。
这是 gitbranch 和 gitrebase 的输出。
$ git branch -a
* (no branch)
master
working_copy
remotes/origin/HEAD -> origin/master
remotes/origin/master
remotes/origin/working_copy
$ git rebase --abort
No rebase in progress?
关于如何修复有什么想法吗？谢谢
Did a Merge Branch locally in working-copy with master. After merging, switching back to master displays HEAD, instead of master as it was before. Also errors pops up when start rails server with rails server, saying no bcrypt file to load. Also Gemfile disappeared from the root subdir.
Ran bundle install and did not help.
Here is the output of git branch and git rebase.
$ git branch -a
* (no branch)
master
working_copy
remotes/origin/HEAD -> origin/master
remotes/origin/master
remotes/origin/working_copy
$ git rebase --abort
No rebase in progress?
Any idea about how to fix? Thanks
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
只要所有内容都已提交，就应该没问题：
这将硬重置为分支上的最后一次提交。从那里，您可以重新开始合并。
As long as everything was commited, you should be fine:
That will hard reset to your last commit on the branch. From there, you can start the merge all over again.