tag:blogger.com,1999:blog-7821856652257554779.post2350440603784333460..comments2025-09-20T09:27:07.510+02:00Andrzej Krzywdahttp://www.blogger.com/profile/06399276063142826365noreply@blogger.comBlogger2125tag:blogger.com,1999:blog-7821856652257554779.post-55261268643034547622008-06-27T12:53:00.000+02:002008-06-27T12:53:00.000+02:00Thanks, Marcin!<BR/><BR/>Indeed, 'git reflog' is VERY useful in situations like this one.Andrzej Krzywdahttps://www.blogger.com/profile/06399276063142826365noreply@blogger.comtag:blogger.com,1999:blog-7821856652257554779.post-57507508545374194962008-06-26T20:09:00.000+02:002008-06-26T20:09:00.000+02:00Actually, there is one more thing you should be aware of - where does HEAD@{1} come from. Before you do the checkout, do <BR/><BR/>git reflog<BR/><BR/>You will see a list of all recent actions in your repository, including the last good commit, which you happened to delete. The list looks like this:<BR/><BR/>ba9a974... HEAD@{0}: commit: commit_message<BR/>391c84e... HEAD@{1}: commit: commit_message<BR/>0145b2f... HEAD@{2}: commit: commit_message<BR/><BR/>Now choose the one HEAD you would like to restore and do the checkout. You are now good to go and to do the merge...Marcin Domanskihttps://www.blogger.com/profile/00857288385499196720noreply@blogger.com