{"thread":{"id":"19655","subject":"rebase and unmerged files","startedAt":"2009-06-04T01:54:47Z","lastAt":"2009-06-04T01:54:47Z","messageCount":1,"participants":["bill lam"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"115403","messageId":"20090604015447.GB3873@debian.b2j","threadId":"19655","inReplyTo":null,"subject":"rebase and unmerged files","fromName":"bill lam","fromEmail":"cbill.lam@gmail.com","sentAt":"2009-06-04T01:54:47Z","receivedAt":"2009-06-04T01:54:47Z","isPatch":false,"sender":{"key":"cbill.lam@gmail.com","avatar":null},"body":"I tried to cleanup commit mistake and use rebase -i. It stopped and\nsha1 and generated a list of unmerge files.  My intention was to use\nthe version in sha1 but with some editing.  Since all those unmerge\nfiles contained unresolved conflict delineated by\n\n<<<<<<\nHEAD\n=======\nsha1\n>>>>>>>\n\nI have to manually type commands such as\ngit checkout sha1 -- file1\nto get the version I wanted for further editing.  Is there any easier\nmethod that can automating checkout all those sha1 version of the\nunmerged files.\n\nAlso, for git-commit during rebase, should I use \ngit commit --amend\nor just\ngit commit\n\n-- \nregards,\n====================================================\nGPG key 1024D/4434BAB3 2008-08-24\ngpg --keyserver subkeys.pgp.net --recv-keys 4434BAB3\n唐詩170 崔顥  黃鶴樓\n    昔人已乘黃鶴去  此地空餘黃鶴樓  黃鶴一去不復返  白雲千載空悠悠\n    晴川歷歷漢陽樹  芳草萋萋鸚鵡洲  日暮鄉關何處是  煙波江上使人愁\n"}]}