Back
[01:01:49] <skunkworks> Thanks!
[07:01:44] <Guest96675> Guest96675 is now known as new2emc
[19:11:58] <KimK> Any git gurus around? I think I've hosed up git pretty good. To begin with, when I run "git branch", I get: * (no branch)<newline> master<newline> v2.4_branch<newline> Is that "* (no branch)" thing legit?
[19:13:16] <cradek> yes, it means your head is disconnected
[19:13:24] <cradek> just checkout the branch you want (git checkout master)
[19:13:48] <KimK> ha, that sounds about right. So I'm in "headless chicken mode"?
[19:13:58] <cradek> guess so
[19:14:02] <cradek> do you know how you got there?
[19:19:42] <KimK> Well, not exactly, but I made a big patch (covering 8 files, my first mistake?) to send to JT, and I didn't send it right away, and it got a week or two stale. So when JT tried to apply it there was a conflict on one of the files, so he couldn't apply any of the patch. So I tried to resolve the conflict, but git merge(?) would only say "You are in the middle of a conflicted merge", I couldn't get it to show me the "their version / my version" display..
[19:19:42] <KimK> . (to be continued)...
[19:25:29] <KimK> So I tried to hand edit out (hand revert?) the conflicting changes in the last file. That sort of worked, and once I got to that point I could again do "git pull --rebase", which I hadn't been able to do. Anyway, now when I checkout v2.4_branch, it seems to put everything back like it was (conflicted). I've done "git reset --hard HEAD" a couple of times now, while checked out master and v2.4_branch. It doesn't seem to fix both at once, and it keeps a
[19:25:29] <KimK> sking me to "rm -rf .dotest", which I've done a couple of times. (TBC)...
[19:27:20] <KimK> Does git search my whole home directory for patch files? I thought if I moved them to my desktop, they wouldn't bother anything there, is that not so? I'd happily remove git and emc2-dev and reclone at this point, nothing seems right. Any advice appreciated.
[19:28:18] <cradek> when you asked for a guru you weren't kidding
[19:29:04] <KimK> Yeah, "it's impossible to make anything foolproof because fools are so ingenious", lol. I forgot who said that.
[19:29:49] <cradek> do you have your patch so you won't lose that work?
[19:30:26] <KimK> Yes, but should I rename it first? Encrypt it first? Pull it off onto another PC first? (Yikes!)
[19:30:51] <cradek> no, git won't mess with it, it's just a file git doesn't care about
[19:31:07] <KimK> It's like the "funniest joke ever written" sketch from Monty Python
[19:31:10] <cradek> git checkout master; git reset --hard origin/master
[19:31:25] <cradek> er are you working on master or v2.4_branch?
[19:32:56] <KimK> Oh, yeah, that was another thing, it now seems insufficient to do git pull --rebase, I get a paragraph saying "you asked me to pull, but you didn't say where or what version...etc" So now I have to do "git pull --rebase origin master" or else git is unhappy
[19:33:40] <KimK> I believe JT wants to do the docs work in 2.4
[19:34:00] <cradek> that's probably because you're not in a tracking branch anymore
[19:34:15] <KimK> but I sometimes compile a new master-emc2 version
[19:34:18] <cradek> ok, git checkout v2.4_branch; git reset --hard origin/v2.4_branch; git pull
[19:34:43] <KimK> git pull without --rebase?
[19:35:09] <cradek> it won't matter in this case
[19:36:45] <KimK> kkirwan@kkirwan-mwbhfw:~/emc2-dev$ git checkout v2.4_branch
[19:36:45] <KimK> Previous HEAD position was 6e4d25c... get rid of unwanted underscores in labels, indexes, and references
[19:36:45] <KimK> fatal: you need to resolve your current index first
[19:37:28] <cradek> I have no clue what that means
[19:38:56] <KimK> So, what do you think, uninstall (completely) git, and delete emc2-dev and reinstall git and reclone?
[19:39:44] <KimK> clearly git and I are not getting off to a good start, lol
[19:39:50] <cradek> sure you could get a new clone (uninstalling git is not necessary) - but maybe you should wait for someone smarter to happen by instead
[19:44:10] <KimK> OK, sure, I'll do that (wait awhile). But it wouldn't take long to re-git and reclone, and is kind of tempting. And if it *still* didn't work I have time to move all my work to the newer PC and wipe the old one.
[19:44:47] <cradek> yeah you could get a new clone and 'git am' your patch in it and be done.
[19:45:23] <KimK> git am? I don't know that one, I'll have to look it up.
[19:46:16] <cradek> it's how you apply the result of git format-patch
[19:47:59] <KimK> There's a hole in most of these newbie guides to git, btw. They seem to say (blah, blah, how to get started), then at this point you resolve your conflicts if there are any, (blah, blah, how to finish up). It would be nice if they went into more detail on the "inherently obvious" part in the middle.
[19:49:11] <cradek> yeah understanding and resolving conflicts is the hard part of a revision control system
[19:52:50] <KimK> OK, well, thanks for helping, and thanks also for your advice on the graphics fix, which I have not yet completely tried. AXIS is working and git isn't, so git is first in line.
[19:57:28] <cradek> welcome, fwiw