{"thread":{"id":"8775","subject":"How do I label conflict blocks in merge-recursive output?","startedAt":"2007-06-29T14:28:49Z","lastAt":"2007-06-29T17:16:00Z","messageCount":2,"participants":["しらいしななこ","Johannes Schindelin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"46049","messageId":"20070629232849.6117@nanako3.bluebottle.com","threadId":"8775","inReplyTo":null,"subject":"How do I label conflict blocks in merge-recursive output?","fromName":"しらいしななこ","fromEmail":"nanako3@bluebottle.com","sentAt":"2007-06-29T14:28:49Z","receivedAt":"2007-06-29T14:28:49Z","isPatch":false,"sender":{"key":"nanako3@lavabit.com","avatar":"https://gravatar.com/avatar/3777b9e201c5883a62b1a6fdf7c53f2d712d1d80989146063ea861e33aad72a8?d=mp&s=160"},"body":"Hi, I am updating my 'git-save' script and have a question.  \n\nWhen I play back the state previously recorded, I run:\n\n   $ git-merge-recursive $base -- HEAD $stash\n\nThis is done after getting the $base (the state the stash was made from),\nand $stash (the state of the interrupted work recorded in the stash) in\nthese variables.  When there are conflicts, I see '<<<<<<<' and '>>>>>>>'\nmarkers in the merged file.\n\nA trouble I am seeing is that there are large hexadecimal string after\nthese markers, like this:\n\n   <<<<<<< 13bd5d46b4a5d4ef44c53fab11e74801c18b16d0:A\n   side\n   revision\n   =======\n   local\n   modification\n   >>>>>>> 9aa4ad6a3bdf5340bed969f6e14abb4e07e794f7:A\n\nI do not know what object these are, and I do not think it is useful to\nshow them to the user.  I want them to say something more useful.\n\nIn a real conflict after a 'git-pull', I think I saw nicer labels that are\nnot hexadecimal strings after these markers.\n\nHow do I tell merge-recursive to do that?  I tried to read the\ndocumentation for merge-recursive but there is no manual page.\n\nTIA\n\n-- \nNanako Shiraishi\nhttp://ivory.ap.teacup.com/nanako3/\n\n----------------------------------------------------------------------\nFind out how you can get spam free email.\nhttp://www.bluebottle.com\n"},{"id":"46053","messageId":"Pine.LNX.4.64.0706291806120.4438@racer.site","threadId":"8775","inReplyTo":"20070629232849.6117@nanako3.bluebottle.com","subject":"Re: How do I label conflict blocks in merge-recursive output?","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-06-29T17:16:00Z","receivedAt":"2007-06-29T17:16:00Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Fri, 29 Jun 2007, しらいしななこ wrote:\n\n> A trouble I am seeing is that there are large hexadecimal string after\n> these markers, like this:\n> \n>    <<<<<<< 13bd5d46b4a5d4ef44c53fab11e74801c18b16d0:A\n>    side\n>    revision\n>    =======\n>    local\n>    modification\n>    >>>>>>> 9aa4ad6a3bdf5340bed969f6e14abb4e07e794f7:A\n> \n> I do not know what object these are, and I do not think it is useful to \n> show them to the user.  I want them to say something more useful.\n>\n> [...]\n>\n> How do I tell merge-recursive to do that?  I tried to read the \n> documentation for merge-recursive but there is no manual page.\n\nYes, it is unfortunately undocumented. To override the name for a given \nSHA-1 (which is the long hex string, and which you can obtain by \n\"git-rev-parse <commit>\"), set the environment variable\n\n\tGITHEAD_<sha1>=\"This is a much nicer message\"\n\nIOW If you would have done this (_before_ calling merge-recursive):\n\n\texport GITHEAD_9aa4ad6a3bdf5340bed969f6e14abb4e07e794f7=nanako\n\nthen the last conflict marker would have read\n\n\t>>>>>>> nanako:A\n\nHth,\nDscho\n"}]}