daniloscjohnston, yes, I believe I did08:00
mhall119nigelb: ping13:18
nigelbmhall119: pong13:40
mhall119nigelb: I need git help13:48
mhall119I forked the Geany repo on github and submitted one pull request.  Now I want to make another, unrelated change13:49
nigelbdid you make a change in master?13:49
mhall119in bzr, I'd make a separate feature branch from trunk13:49
mhall119see, this is the part I don't understand13:49
nigelbso, in git, usually, if you want to make a pull request, you make it in a different branch other than master.13:49
nigelbright, git has colocated branches.13:49
mhall119I did git clone, <change, change change>; git add; git commit; git push13:49
nigelbaha, so those changes went into your master13:49
mhall119ok, so what should I do now13:51
nigelbso, 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
nigelbwant me to walk you through it?13:53
mhall119yes please :)13:54
mhall119I looked for an "uncommit" or something, but came up empty13:56
nigelbmhall119: git reset HEAD^14:00
nigelbthat will undo the commit without undoing the changes.14:00
nigelb(only one commit)14:00
nigelbthat ^ is important14:00
mhall119"Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded."14:06
nigelbmhall119: do a 'git diff' and ensure what you see were the changes in the commit you made.14:07
nigelbmhall119: git branch -b <branch-name>14:11
nigelbwhere <branch-name> is whatever name you decide to give it.14:11
mhall119what does -b do?14:11
nigelbit creates a new branch14:12
nigelboh fuck14:12
nigelbyou don't need 0-b ;)14:12
nigelbI mean, you don't need -b14:12
nigelbit should work without it14:12
mhall119now git checkout <branch-name>?14:12
nigelbI was supposed to tell you git checkout -b14:13
nigelbthat would have created the branch and switched you to it :)14:13
mhall119will "git push" push the whole repo or just the current branch?14:16
nigelbmhall119: now commit and push.14:16
mhall119To git@github.com:mhall119/geany.git ! [rejected]        master -> master (non-fast-forward)14:17
mhall119error: failed to push some refs to 'git@github.com:mhall119/geany.git'14:17
mhall119To prevent you from losing history, non-fast-forward updates were rejected14:17
mhall119Merge the remote changes (e.g. 'git pull') before pushing again.  See the14:17
mhall119'Note about fast-forwards' section of 'git push --help' for details.14:17
nigelbmhall119: git push -f14:19
nigelbyou'll rewrite history bcause you removed a commit.14:19
nigelbmhall119: 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:22
nigelbbasically, switch to the correct branch and then initiate a pull requst14:23
nigelbon the github UI that is14:23
mhall119I'm not seeing my new branched on github yet14:23
nigelbmhall119: oh. right. git push origin <branch-name>14:25
nigelbSorry, a lot of it is instinct for me and I forget it when I'm teling someone how to do it.14:26
mhall119no problem, thanks for the help nigelb14:32
nigelbmhall119: np :)14:32
nigelbmhall119: remember to switch to master, and then create a new branch.14:33
nigelbbranch are stacked on top of whatever branch you're currently on.14:34
mhall119makes sense14:37
nigelbA lot of git makes sense when you understand how it works.14:39
nigelbExcept that takes a long long time to explain ;)14:40
svwilliamsping cjohnston22:53
cjohnstonwhats up sv22:57
svwilliamshey cjohnston22:57
svwilliamsfinally back on a box I can do work on22:57
svwilliamswas trying to build one of my old branches (and merged with latest loco-directory)22:58
cjohnstonyou coming friday with the balloon?22:58
svwilliamsI'm thinking about it, I may have to drive seperate22:58
svwilliamshe is thinking about staying in orlando the weekend22:58
cjohnstonif you can, thatd be awesome22:58
cjohnstonoh.. cool22:58
svwilliamsI'm getting an error on make init22:59
svwilliamswith "No distributions matching the version for bzr==2.4b4"23:00
svwilliamsits been so long I'm wondering if something changed and I just need to update?23:00
cjohnstonsvwilliams: one sec, ill make all better23:01
cjohnstonsvwilliams: bzr merge lp:~chrisjohnston/loco-team-portal/bzr-req-update23:07
cjohnstonbzr commit -m "Updates bzr requirement"23:08
svwilliamswohoo it got past that part!23:10
svwilliamsthank you cjohnston23:10
cjohnstonsvwilliams: 2.4 is no longer beta23:11
cjohnstonso it is now greater than or equal to 24.423:11
svwilliamsahh ..23:11
svwilliams:-) makes sense23:11
svwilliamsits what happens when you step away for months at a time23:11
cjohnstonsvwilliams: http://loco.ubuntu.com/events/ubuntu-us-florida/1445/detail/23:14
svwilliamsexcellent! registering my maybe (got take time off to attend)23:16
cjohnstonlet me know23:20
cjohnstonbring a few $$ for whatever we decide to do for lunch23:20
svwilliamswill do23:24
svwilliamsI've decided to go, I just need to get approval of my boss to take the day off23:24
svwilliamsso I'll let you know as soon as I know :-23:24

Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!