我有一个包含3个分支的repo:master、Stable和dev。我对dev分支做了很多更改并提交了它们。然后,我的同事在顶部签出了Stable分支,并创建了一个标记。
当我切换回dev分支时,文件已恢复到旧版本。当我检查git日志时,我可以看到我使用正确文件进行的所有提交。在dev分支上没有任何提交表明代码已经合并回来。
有可能取回这些文件吗?还是我必须重做所有的文件?
我有一个包含3个分支的repo:master、Stable和dev。我对dev分支做了很多更改并提交了它们。然后,我的同事在顶部签出了Stable分支,并创建了一个标记。
当我切换回dev分支时,文件已恢复到旧版本。当我检查git日志时,我可以看到我使用正确文件进行的所有提交。在dev分支上没有任何提交表明代码已经合并回来。
有可能取回这些文件吗?还是我必须重做所有的文件?
这里并不是一个真正的解决方案,但我在处理这类问题时使用的是gitk或其他一些git GUI。
你说你可以在执行<code>git log</code>时看到提交,你能看到提交ID吗?你可以随时用它结账。。。至少要确保没有损失。
您应该能够用“git reflog”找到丢失提交的提交引用,然后您就可以挑选它们了。
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. ...
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 ...
I have a svn repo with various apps as subdirectory of a single svn repo. That worked because I could have checked out a partial, repo. As I cant do that with git obviously I need multiple repos. I ...
I understand how to merge branches together in git, and I love how easy it makes it. I have a branch that looks like this: project/ |--subproj1/ | |---(files) | |--subproj2/ |---(files) A ...
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 ...
I get this on every git svn command I try. I am using git version 1.6.4.2 on OS 10.6 The initial git svn fetch works, and i can do further fetches after that, but they do not enter the log or update ...
Given I have a master branch and a other branch. In the other branch are files I don t want to commit (e.g. log files) so I ignored them in .gitignore. When I switch to the master branch, these ...
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 ...