[08:00] cjohnston, yes, I believe I did [13:18] nigelb: ping [13:40] mhall119: pong [13:48] nigelb: I need git help [13:49] I forked the Geany repo on github and submitted one pull request. Now I want to make another, unrelated change [13:49] did you make a change in master? [13:49] in bzr, I'd make a separate feature branch from trunk [13:49] see, this is the part I don't understand [13:49] master? [13:49] so, in git, usually, if you want to make a pull request, you make it in a different branch other than master. [13:49] right, git has colocated branches. [13:49] I did git clone, ; git add; git commit; git push [13:49] aha, so those changes went into your master [13:51] ok, so what should I do now [13:53] so, I would say, undo your changes in master. switch to a new branch, commit those, and then create a new pull request form that branch. [13:53] want me to walk you through it? [13:54] yes please :) [13:56] I looked for an "uncommit" or something, but came up empty [14:00] mhall119: git reset HEAD^ [14:00] that will undo the commit without undoing the changes. [14:00] (only one commit) [14:00] that ^ is important [14:05] ok [14:06] "Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded." [14:07] ok! [14:07] mhall119: do a 'git diff' and ensure what you see were the changes in the commit you made. [14:07] yup [14:11] mhall119: git branch -b [14:11] where is whatever name you decide to give it. [14:11] what does -b do? [14:12] it creates a new branch [14:12] oh fuck [14:12] you don't need 0-b ;) [14:12] I mean, you don't need -b [14:12] it should work without it [14:12] done [14:12] now git checkout ? [14:13] yes [14:13] I was supposed to tell you git checkout -b [14:13] that would have created the branch and switched you to it :) [14:16] will "git push" push the whole repo or just the current branch? [14:16] mhall119: now commit and push. [14:17] To git@github.com:mhall119/geany.git ! [rejected] master -> master (non-fast-forward) [14:17] error: failed to push some refs to 'git@github.com:mhall119/geany.git' [14:17] To prevent you from losing history, non-fast-forward updates were rejected [14:17] Merge the remote changes (e.g. 'git pull') before pushing again. See the [14:17] 'Note about fast-forwards' section of 'git push --help' for details. [14:19] mhall119: git push -f [14:19] you'll rewrite history bcause you removed a commit. [14:22] mhall119: now you need to close your old pull request and create a new one form the right branch. Let me know if you can't figure out how. [14:23] basically, switch to the correct branch and then initiate a pull requst [14:23] on the github UI that is [14:23] I'm not seeing my new branched on github yet [14:25] mhall119: oh. right. git push origin [14:26] Sorry, a lot of it is instinct for me and I forget it when I'm teling someone how to do it. [14:32] no problem, thanks for the help nigelb [14:32] mhall119: np :) [14:33] mhall119: remember to switch to master, and then create a new branch. [14:34] branch are stacked on top of whatever branch you're currently on. [14:37] makes sense [14:39] A lot of git makes sense when you understand how it works. [14:40] Except that takes a long long time to explain ;) [22:53] ping cjohnston [22:57] whats up sv [22:57] svwilliams: [22:57] hey cjohnston [22:57] o/ [22:57] finally back on a box I can do work on [22:58] was trying to build one of my old branches (and merged with latest loco-directory) [22:58] you coming friday with the balloon? [22:58] cool [22:58] I'm thinking about it, I may have to drive seperate [22:58] he is thinking about staying in orlando the weekend [22:58] if you can, thatd be awesome [22:58] oh.. cool [22:59] I'm getting an error on make init [23:00] with "No distributions matching the version for bzr==2.4b4" [23:00] its been so long I'm wondering if something changed and I just need to update? [23:01] svwilliams: one sec, ill make all better [23:01] :-) [23:07] svwilliams: bzr merge lp:~chrisjohnston/loco-team-portal/bzr-req-update [23:08] bzr commit -m "Updates bzr requirement" [23:10] wohoo it got past that part! [23:10] thank you cjohnston [23:10] np [23:11] svwilliams: 2.4 is no longer beta [23:11] so it is now greater than or equal to 24.4 [23:11] 2.4 [23:11] :-) [23:11] ahh .. [23:11] :-) makes sense [23:11] its what happens when you step away for months at a time [23:11] :-) [23:13] heh [23:14] svwilliams: http://loco.ubuntu.com/events/ubuntu-us-florida/1445/detail/ [23:16] excellent! registering my maybe (got take time off to attend) [23:20] ok [23:20] let me know [23:20] bring a few $$ for whatever we decide to do for lunch [23:24] will do [23:24] I' [23:24] I've decided to go, I just need to get approval of my boss to take the day off [23:24] so I'll let you know as soon as I know :- [23:24] ) [23:25] :-)