Re: Please undo "Use git-merge instead of git-resolve in

From: Jon Loeliger <jdl@jdl.com>
Date: Sep 23, 2005, 13:51 UTC
Message-ID: <E1EInxJ-00026N-Ll@jdl.com>

Show 5 quoted lines

>> (This is an intentional asymmetry, right?  Distributed systems, right?)
>
>Right. It's intentional. The "master" branch tends to be the main one for
>everybody, but _my_ "master" branch is clearly _your_ "linus" branch, and
>_your_ "master" branch would be the "jon" branch for me.

OK, I'm being clued slowly... :-)

>So it's not "asymmetric". It _is_ symmetric, but it's symmetric the same
>way "left" and "right" are symmetric when facing each other - my left is
>your right, your left is my right. It's a symmetry, but it's not an 
>_identity_.

Ah, right.  I mis-spoke myself, I see. :-)

> What does
>
>	git-cat-file -t 3fd07d3bf0077dcc0f5a33d2eb1938ea050da8da

It used to be nothing at all. It is now (after another fetch) a commit. And, it did leave this:

    jdl.com 231 % cat .git/refs/heads/origin.remote
    3fd07d3bf0077dcc0f5a33d2eb1938ea050da8da

> Actually, the fact that it even left it as a head might
> cause problems (because now you have a reference to something
> that doesn't exist), so you are probably best off just removing
> the .git/refs/heads/origin.remote file entirely.

Excellent.

<aside stage=left> IMO, one of the things that distinguishes those "who get git" and those who don't yet git it, are the ones who can casually toss out phrases like, "Oh, you don't need that, just rm it." The rest of us sit around and ponder "Do I need _that_ data? How do I know I can toss it? If I toss it, what will be lost with it? But if I revert the index, I lose... _it_, right?"

There is a certain amount of opacity to Git and its Object store that makes it a bit scary. And, at least for me, as a result I am a bit reluctant to go wildly experimenting. With more certainty as to "recovering from badness", I'll be more familiar and more willing to experiment, I'm sure. </aside>

Things are better, I've now been able to:

    * committish: e484585ec3ee66cd07a627d3a9e2364640a3807f
      branch 'master' of rsync://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
    * refs/heads/origin: fast forward to branch 'master' of rsync://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Thanks for your help!

jdl