{"thread":{"id":"1926","subject":"Re: Please undo \"Use git-merge instead of git-resolve in","startedAt":"2005-09-23T13:51:13Z","lastAt":"2005-09-23T13:51:13Z","messageCount":1,"participants":["Jon Loeliger"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"9187","messageId":"E1EInxJ-00026N-Ll@jdl.com","threadId":"1926","inReplyTo":null,"subject":"Re: Please undo \"Use git-merge instead of git-resolve in","fromName":"Jon Loeliger","fromEmail":"jdl@jdl.com","sentAt":"2005-09-23T13:51:13Z","receivedAt":"2005-09-23T13:51:13Z","isPatch":false,"sender":{"key":"jdl@jdl.com","avatar":"https://gravatar.com/avatar/75ce9a10b151acd2c28ec4ab2136dba7b2ff1634530bd04b155981a749d08a64?d=mp&s=160"},"body":"\n\n>> (This is an intentional asymmetry, right?  Distributed systems, right?)\n>\n>Right. It's intentional. The \"master\" branch tends to be the main one for\n>everybody, but _my_ \"master\" branch is clearly _your_ \"linus\" branch, and\n>_your_ \"master\" branch would be the \"jon\" branch for me.\n\nOK, I'm being clued slowly... :-)\n\n>So it's not \"asymmetric\". It _is_ symmetric, but it's symmetric the same\n>way \"left\" and \"right\" are symmetric when facing each other - my left is\n>your right, your left is my right. It's a symmetry, but it's not an \n>_identity_.\n\nAh, right.  I mis-spoke myself, I see. :-)\n\n> What does\n>\n>\tgit-cat-file -t 3fd07d3bf0077dcc0f5a33d2eb1938ea050da8da\n\nIt used to be nothing at all.  It is now (after another fetch)\na commit.  And, it did leave this:\n\n    jdl.com 231 % cat .git/refs/heads/origin.remote\n    3fd07d3bf0077dcc0f5a33d2eb1938ea050da8da\n\n\n> Actually, the fact that it even left it as a head might\n> cause problems (because now you have a reference to something\n> that doesn't exist), so you are probably best off just removing\n> the .git/refs/heads/origin.remote file entirely.\n\nExcellent.\n\n<aside stage=left>\nIMO, one of the things that distinguishes those \"who get git\"\nand those who don't yet git it, are the ones who can casually\ntoss out phrases like, \"Oh, you don't need that, just rm it.\"\nThe rest of us sit around and ponder \"Do I need _that_ data?\nHow do I know I can toss it?  If I toss it, what will be lost\nwith it?  But if I revert the index, I lose... _it_, right?\"\n\nThere is a certain amount of opacity to Git and its Object\nstore that makes it a bit scary.  And, at least for me, as\na result I am a bit reluctant to go wildly experimenting.\nWith more certainty as to \"recovering from badness\", I'll\nbe more familiar and more willing to experiment, I'm sure.\n</aside>\n\nThings are better, I've now been able to:\n\n    * committish: e484585ec3ee66cd07a627d3a9e2364640a3807f\n      branch 'master' of rsync://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6\n    * refs/heads/origin: fast forward to branch 'master' of rsync://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6\n\n\nThanks for your help!\n\njdl\n"}]}