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