-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 > > Any thoughts on that? Am I the only one to experience that?
No, I've seen things like this around here. I think it happened to Mike and Travis at least once each, too. We do a lot of branching and merging around here. If you Google something like, say, "git rebase failure recovery" you'll find that problems like this one aren't that uncommon. While git is very smart most of the time, every once in a while you find your way into a corner case where it is very very stupid. In the past I have both tried doing what Google told me, and cherry-picked my changes into a new, clean tree. Both have worked ok. Which is more work seems to depend on the situation. It's good that you still have your working trees around. This is part of why I branch so much. (that, and because it's just how I think about things) To close this incredibly unhelpful message, I'll suggest that 'git gui', if you have it installed, may help you untangle what went wrong. Often when these things happen you can look at the branch structure and see something out of place. Usually it's a perfectly valid thing to do, just a strange branching structure, and git just choked because it looked odd. I'll also give you links that we found after something like this happened to Mike recently: http://www.bluemangolearning.com/blog/2009/03/recovering-from-a-disastrous-git-rebase-mistake/ http://alexscordellis.blogspot.com/2009/07/how-to-recover-lost-commits-in-git.html Good luck, Joe -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iQIcBAEBCAAGBQJL8tROAAoJEGh+D3e/PaCr42cP/1HAN0Cs4gcBac+GrnTsok4L sjUAK5Z5tac7BtZc3yEcxdu2Ve/GmTeu+41DiDOZQX0Cdkv0YXRI3PpzbCjdp25N PuDnfcaoOZWouGDYfZEVmWuTmLZJeTbhaDjih2mWpF1a8NfIQ5UBiUMGbcfuMWlV DUTAQOFFtPEHrDA6Ki+wivKVovSbAipHI2yxq7ZSwsbehSLo82kzQGxv+kyD3Drs xuFY0yPVAoBgk9zN6Msan3aZoENYFMPFQFVUNOMZUnwyfZZr1V8HEXhB/ajE5njC OgFaxqGbkd2bKzrjEFKHmntl0u6YWg3qAOoDL186zer7Jf75mdfx7X6/w8SwlKR+ zr1HfSRv33930yOtuzUagTONvr247BeKA0IM+W2a7eEbN1EFNEal2/XcfELImglE ZXwoZgvyA9x2Zx9nwVAFsLVwAoC60OK3CA75HNY4kozJJ7p2o7HmTjU7GeStpcTj O39seb37xLZZ8ay0L87q87N5My1dN49hA7bvgk7NSOMFk4L+bu0nURLyjJoPwZXh rwUVH798SkB+ZIqEjVV/EftL3VN08xu1k/Z8SDbM8cDQHPq3X8RJMdQQqjmfbeml WZAATnrLyxd13jLjIzetFGePWd5aUyS4FAKtxAlBxE9rT/VRgQnwv7CZJ1VnZ8+d 3tUhf0QclSssVT7ns+cP =1YaQ -----END PGP SIGNATURE-----
