{"thread":{"id":"9750","subject":"conflict markers not documented","startedAt":"2007-09-02T18:32:28Z","lastAt":"2007-09-02T18:32:28Z","messageCount":1,"participants":["Alan M. Feldstein"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"52247","messageId":"46DB01BC.8030606@alanfeldstein.com","threadId":"9750","inReplyTo":null,"subject":"conflict markers not documented","fromName":"Alan M. Feldstein","fromEmail":"alan@alanfeldstein.com","sentAt":"2007-09-02T18:32:28Z","receivedAt":"2007-09-02T18:32:28Z","isPatch":false,"sender":{"key":"alan@alanfeldstein.com","avatar":null},"body":"I can't find Git conflict markers documented anywhere. If I do\n\n    git pull git://icarus.com/~steve-icarus/verilog v0_8-branch\n\nthat results in files marked like this, for example\n\n    <<<<<<< HEAD:Attrib.cc\n    #ident \"$Id: Attrib.cc,v 1.5 2002/08/12 01:34:58 steve Exp $\"\n    =======\n    #ident \"$Id: Attrib.cc,v 1.6 2004/02/20 18:53:33 steve Exp $\"\n     >>>>>>> f600e774d54f14d2cc2848ea5ef663233f8a6f6e:Attrib.cc\n\nThe git-pull(1) Manual Page \n<http://www.kernel.org/pub/software/scm/git/docs/git-pull.html> mentions \nconflicts in three places, but fails to document the markers or lead me \nto a page that does. The closest thing I've found is Git User's Manual \n(for version 1.5.3 or newer) \n<http://www.kernel.org/pub/software/scm/git/docs/user-manual.html> with\n\n    <<<<<<< HEAD:file.txt\n    Hello world\n    =======\n    Goodbye\n     >>>>>>> 77976da35a11db4580b80ae27e8d65caf5208086:file.txt\n\nbut it fails to explain which is which, only stating that \"All you need \nto do is edit the files to resolve the conflicts ...\". That's not enough \ninformation.\n\nIn _Essential CVS_ by Jennifer Vesperman, she documents (even more \nclearly than the Cederqvist) CVS conflict markers like this\n\n    <<<<<<< filename\n    sandbox content\n    =======\n    repository content\n     >>>>>>> revision\n\n >From this, I can infer that\n\n    #ident \"$Id: Attrib.cc,v 1.5 2002/08/12 01:34:58 steve Exp $\"\n\nwas my Git repository content and\n\n    #ident \"$Id: Attrib.cc,v 1.6 2004/02/20 18:53:33 steve Exp $\"\n\nwas the other repository content (from which I fetched).\n\nBut I shouldn't need to refer to a CVS book to understand Git. Git's \ndocumentation should have made this clear. So I'm not writing this to \nask for confirmation of my inference from the Git mailing list. I'm \nwriting this to ask that the Git documentation be improved to adequately \nexplain conflict markers.\n-- \n\nAlan Feldstein\n\nCosmic Horizon logo\n\nhttp://www.alanfeldstein.com/\n\n+1 585 415 6682\n"}]}