English 中文(简体)
Git签出到分支未显示正确版本的文件
原标题:Git checkout to branch not showing correct versions of files
  • 时间:2011-06-02 16:14:11
  •  标签:
  • git

我有一个包含3个分支的repo:master、Stable和dev。我对dev分支做了很多更改并提交了它们。然后,我的同事在顶部签出了Stable分支,并创建了一个标记。

当我切换回dev分支时,文件已恢复到旧版本。当我检查git日志时,我可以看到我使用正确文件进行的所有提交。在dev分支上没有任何提交表明代码已经合并回来。

有可能取回这些文件吗?还是我必须重做所有的文件?

最佳回答

这里并不是一个真正的解决方案,但我在处理这类问题时使用的是gitk或其他一些git GUI。

你说你可以在执行<code>git log</code>时看到提交,你能看到提交ID吗?你可以随时用它结账。。。至少要确保没有损失。

问题回答

您应该能够用“git reflog”找到丢失提交的提交引用,然后您就可以挑选它们了。





相关问题
git confusion - cloning a repo is returning a past version

Im having some confusion with my git usage. I cloned a repo from one comp to the other, and the new clone is the state of the original that was active some time ago. So its cloning a past version. ...

Appropriate strategy for tagging and hotfixing with git

I was wondering if the strategy I m using for tagging and hotfixing tags (which then I use for deploying rails applications) with git is appropriate. For tagging I just tag a commit of the master ...

Tips on upgrading CVS to git/hg?

We still use CVS, I use git and hg for my personal use though I m still a novice at both, but I realize they re much more modern and better, faster, distributed, etc. It s just everyone is so ...

Using Git in a TFS shop

Using Git at home has spoiled me - I now find using TFS at work to be a bit of a drag and want to explore the possibility of using Git locally and syncing somehow with TFS. I figure there are a few ...

热门标签