From: Howard Miller Date: Tue, 15 Sep 2009 12:10:07 GMT Subject: Re: Commited to wrong branch Message-ID: <26ae428a0909150510n56b1d4eg6565a6cca8c9b46c@mail.gmail.com> In-Reply-To: <46a038f90909150416h60ea7d74xd2337fe50f603dcb@mail.gmail.com> Martin, Looked at gitk - yes there is definitely one more commit still on the current (wrong) branch. I deleted the offending file and have now successfully switched to the other (correct) branch. Howard 2009/9/15 Martin Langhoff : > On Tue, Sep 15, 2009 at 1:05 PM, Howard Miller > wrote: >> I'm pretty shocked how difficult this is... still... > > No prob. It's only hard at the beginning :-) > >> I'm finding git logs and reflogs pretty difficult to read and >> interpret (head melting) - in particular telling what happened on what >> branch - > > I found gitk enormously helpful to visualise things. Try > >  gitk # will show you the current branch > >  gitk X Y # will show you both branches > > gitk is a ton easier to visualise. git log is pretty good but won't > show merges, so it's limited. > > git reflog is confusing, but it's mostly a tool to help when there's > been a mess and you want to diagnose WTH happened... > >>but looking at the reflog (which I assume is showing me the >> actions on the current branch, but I'm not sure) > > Don't worry about the reflog... > >>  I think I must have >> made two commits on the wrong branch so the reset has only 'popped' >> the top one. Other than that your interpretation is correct. > > Ok, so looking at gitk, there would still be one "wrong" commit. Can > you confirm? > >> I cannot currently change branches - it only complains about one file. > > If you did follow my previous instructions (specially doing 'git reset > --hard'), then this should not happen. Except... > > Except when you have a file that git is not tracking, and it exists in > the "other" branch. The commit you undid earlier probably added that > file. So just rm that file, and change branches. > >> I'm a bit worried about that - I would like to understand why this is >> a problem but I don't. > > About the file? It was "new" in the commit you un-committed. So when > you do git reset --hard, git makes sure all the files it is > _currently_ tracking are "unchanged". If that file was new, it ignores > it. Just rm it and be happy. > >> So I am now a little hazy on how to deal with previous TWO commits. > > Just review gitk and confirm if there are more commits to unstich -- > and we'll  work from there > > > m > -- >  martin.langhoff@gmail.com >  martin@laptop.org -- School Server Architect >  - ask interesting questions >  - don't get distracted with shiny stuff  - working code first >  - http://wiki.laptop.org/go/User:Martinlanghoff >