Page 33 of 134, showing 100 records out of 13,394 total, starting on record 3,201, ending on 3,300
# | Username | Text | |
---|---|---|---|
# | Jul 31st 2009, 16:05 | jperras | that's why we have a no newlines policy in the core |
# | Jul 31st 2009, 16:05 | alkemann | so annoyinig that they couldnt agree on a neweline code |
# | Jul 31st 2009, 16:05 | jperras | heh |
# | Jul 31st 2009, 16:04 | alkemann | i ended up just pushing it http://thechaw.com/bakery/commits/view/b277acaded587bfe8f9ff287d52c53d04cffff57 |
# | Jul 31st 2009, 16:04 | jperras | I gotta go for now though |
# | Jul 31st 2009, 16:04 | jperras | ok, I'll take a look at it this weekend if you want |
# | Jul 31st 2009, 16:04 | alkemann | now they are at the same commit |
# | Jul 31st 2009, 16:04 | jperras | hm |
# | Jul 31st 2009, 16:02 | alkemann | i hate to push a commit of a newline thing, but thats whwere the stash is from. i keep having to create branches and delete it with the single commit to get rid of this invisible change that keeps happening to a file |
# | Jul 31st 2009, 16:02 | jperras | yeah, sometimes that's the only easy way |
# | Jul 31st 2009, 16:01 | alkemann | i gave up on the subway map from phally :P i cherry picked his fox back into usersplugin and merge it back |
# | Jul 31st 2009, 16:00 | alkemann | stash clear did it. sorta |
# | Jul 31st 2009, 16:00 | jperras | which will apply and remove the topmost item |
# | Jul 31st 2009, 16:00 | jperras | you can do a git stash pop |
# | Jul 31st 2009, 16:00 | jperras | it'll show you the two stashes |
# | Jul 31st 2009, 16:00 | jperras | do a git stash list |
# | Jul 31st 2009, 16:00 | alkemann | yea i tried stash apply |
# | Jul 31st 2009, 15:59 | jperras | that's just a stash that you made |
# | Jul 31st 2009, 15:59 | jperras | that |
# | Jul 31st 2009, 15:59 | jperras | hey |
# | Jul 31st 2009, 15:56 | alkemann | git problem http://imagebin.ca/img/XgT6eM.gif |
# | Jul 31st 2009, 15:55 | alkemann | jperras: alive? |
# | Jul 31st 2009, 10:01 | alkemann | sigh.. cant figure this out now. i gotta head out. laters |
# | Jul 31st 2009, 10:00 | alkemann | tried ti cherry pick the 2.0 commit into the userplugin comtti and got conflict.. |
# | Jul 31st 2009, 09:56 | alkemann | i am looking at the gitk visualization. but .. |
# | Jul 31st 2009, 09:55 | jperras | a graphical viewer does help, you just need to get used to it |
# | Jul 31st 2009, 09:54 | jperras | well, svn has merge commits as well |
# | Jul 31st 2009, 09:54 | alkemann | the difference between my local 2.0 and the remote 2.0 is 4 commits and 4 merges. not in order |
# | Jul 31st 2009, 09:53 | alkemann | these merge commits gives me troubles.. i know ther suppose to help, but tbh it does |
# | Jul 31st 2009, 09:52 | jperras | no graph for you |
# | Jul 31st 2009, 09:52 | jperras | ah, oh well |
# | Jul 31st 2009, 09:52 | alkemann | 1.6.1.9 |
# | Jul 31st 2009, 09:51 | jperras | if you have git 1.6.3, try a git log --graph |
# | Jul 31st 2009, 09:51 | jperras | haha |
# | Jul 31st 2009, 09:51 | alkemann | jperras: these gitk lines looks like a subway system made by a blind man.. not sure it helps alot heh |
# | Jul 31st 2009, 09:50 | alkemann | indeed u had better |
# | Jul 31st 2009, 09:50 | jperras | P |
# | Jul 31st 2009, 09:50 | jperras | 25? oy. Guess I better get crackin' |
# | Jul 31st 2009, 09:50 | jperras | and then run a git revert on the hash you want to get rid of |
# | Jul 31st 2009, 09:50 | jperras | so cherry-pick the commit from one to the other |
# | Jul 31st 2009, 09:49 | alkemann | jperras: and 25 in pending ;) |
# | Jul 31st 2009, 09:48 | alkemann | the merge of 2.0 into 2.0 doesnt sound like it does anything usefull anyways |
# | Jul 31st 2009, 09:47 | jperras | and then change 2.0 so that the commits are reversed |
# | Jul 31st 2009, 09:47 | jperras | well, you can cherry-pick the commits from 2.0 to usersplugin |
# | Jul 31st 2009, 09:47 | alkemann | removed developer Write permission to 2.0 brannch then |
# | Jul 31st 2009, 09:47 | jperras | ok |
# | Jul 31st 2009, 09:46 | alkemann | yea |
# | Jul 31st 2009, 09:46 | jperras | so the two commits to 2.0 need to be moved to the usersplugin? |
# | Jul 31st 2009, 09:46 | jperras | ok |
# | Jul 31st 2009, 09:45 | alkemann | he is only suppose to work on the usersplugin branch |
# | Jul 31st 2009, 09:45 | alkemann | yea |
# | Jul 31st 2009, 09:45 | jperras | so those should have been in the usersplugin branch instead? |
# | Jul 31st 2009, 09:44 | alkemann | yea two commits from him in the 2.0 branch |
# | Jul 31st 2009, 09:44 | jperras | he pushed it to the usersplugin branch |
# | Jul 31st 2009, 09:43 | alkemann | havnt pulled on this computer. ill check |
# | Jul 31st 2009, 09:42 | jperras | what does gitx/git log say? |
# | Jul 31st 2009, 09:42 | alkemann | timeline seems to say he pushed to wrong branch |
# | Jul 31st 2009, 09:42 | jperras | what happened? |
# | Jul 31st 2009, 09:40 | alkemann | http://thechaw.com/bakery/timeline |
# | Jul 31st 2009, 09:40 | alkemann | any git master can see what Phally did and maybe fix it? if it needs fixing.. |
# | Jul 29th 2009, 17:20 | gwoo | svn on windows needs them too i think |
# | Jul 29th 2009, 17:11 | ProLoser|Work | or other versioning tools also? |
# | Jul 29th 2009, 17:11 | ProLoser|Work | are the emtpy files for git? |
# | Jul 29th 2009, 10:46 | User459 | I am new in cakephp. I need help creating a captcha, anybody know of a good complete tutorial |
# | Jul 29th 2009, 07:41 | alkemann | i think it is tantamount to suicide to post "i am burned out" about a marriage. so i must assume it is about something else ;) |
# | Jul 29th 2009, 07:37 | markstory | alkemann: he's getting married too, which is always fun. |
# | Jul 29th 2009, 04:38 | alkemann | i hope this is not about cakephp ? http://twitter.com/nateabele/status/2903551064 |
# | Jul 28th 2009, 03:57 | alkemann | good morning |
# | Jul 27th 2009, 16:08 | ProLoser|Work | that mighta been a later change, i haven't come across that yet |
# | Jul 27th 2009, 16:07 | ProLoser|Work | ah |
# | Jul 27th 2009, 16:07 | AD7six | I have experts, yes |
# | Jul 27th 2009, 16:07 | AD7six | although I'm about to go to bed |
# | Jul 27th 2009, 16:07 | ProLoser|Work | you didn't inheritly design a system of uh 'proffessional' answerers did you? |
# | Jul 27th 2009, 16:07 | AD7six | btw I think it'd be more appropriate if we discussed none cake things in #7six |
# | Jul 27th 2009, 16:06 | ProLoser|Work | alrighty |
# | Jul 27th 2009, 16:06 | ProLoser|Work | i have no idea |
# | Jul 27th 2009, 16:06 | AD7six | something happens - you assign points |
# | Jul 27th 2009, 16:06 | AD7six | why would you need a custom algorithm |
# | Jul 27th 2009, 16:06 | ProLoser|Work | or maybe some custom algorithm |
# | Jul 27th 2009, 16:06 | AD7six | code as oposed to description |
# | Jul 27th 2009, 16:06 | ProLoser|Work | like the increment quantity |
# | Jul 27th 2009, 16:06 | ProLoser|Work | iunno... code? |
# | Jul 27th 2009, 16:05 | AD7six | what are you expecting |
# | Jul 27th 2009, 16:05 | ProLoser|Work | but it's not executable code, just a summary of the action? |
# | Jul 27th 2009, 16:05 | AD7six | code is like answer, ask, selectedBest etc. |
# | Jul 27th 2009, 16:04 | ProLoser|Work | ahhh |
# | Jul 27th 2009, 16:04 | ProLoser|Work | which confused me a little |
# | Jul 27th 2009, 16:04 | AD7six | my requirment is a bit diffierent but http://answers.yahoo.com/info/scoring_system |
# | Jul 27th 2009, 16:04 | ProLoser|Work | where you created models and code events |
# | Jul 27th 2009, 16:03 | ProLoser|Work | 1 way as in you only gain points by being assigned them by the questioner |
# | Jul 27th 2009, 16:03 | ProLoser|Work | yes in point_events i believe |
# | Jul 27th 2009, 16:03 | AD7six | one way? |
# | Jul 27th 2009, 16:03 | AD7six | the codefield? |
# | Jul 27th 2009, 16:03 | ProLoser|Work | and it collected the total of all those fields, not just the number of records, and stored them into the countercache |
# | Jul 27th 2009, 16:03 | ProLoser|Work | that let you specify a specific field to count |
# | Jul 27th 2009, 16:02 | ProLoser|Work | i kinda created a custom countercache |
# | Jul 27th 2009, 16:02 | ProLoser|Work | i sorta don't get how you use the code field |
# | Jul 27th 2009, 16:02 | ProLoser|Work | but yahoo only has 1 way to gain points |
# | Jul 27th 2009, 16:02 | AD7six | ProLoser|Work: to start with using the same system as yahoo |
# | Jul 27th 2009, 16:00 | ProLoser|Work | AD7six: were you designing it so there are multiple ways to gain points? |