| # |
Mar 9th 2009, 15:01 |
AD7six |
alkemann: btw git merge -s ours seems to give the best results most of the time |
| # |
Mar 9th 2009, 15:01 |
alkemann |
why do we have a "config" table though |
| # |
Mar 9th 2009, 15:00 |
alkemann |
luckily we have schema :) |
| # |
Mar 9th 2009, 14:59 |
alkemann |
give me back my left socks |
| # |
Mar 9th 2009, 14:58 |
ADmad |
its the db snatchers |
| # |
Mar 9th 2009, 14:58 |
alkemann |
buhu, my db is gone |
| # |
Mar 9th 2009, 14:57 |
alkemann |
gotta blame someone |
| # |
Mar 9th 2009, 14:56 |
ADmad |
alkemann: are you impling i screwed up something ? i have no idea :) |
| # |
Mar 9th 2009, 14:55 |
jperras |
ie. use git to create/track remote svn branches, develop and push to those through git-svn, then merge everything back to trunk using git when all's done. |
| # |
Mar 9th 2009, 14:55 |
alkemann |
ADmad: why am i getting "Error: Database table config for model Config was not found." ? |
| # |
Mar 9th 2009, 14:54 |
jperras |
saves a ton of trouble |
| # |
Mar 9th 2009, 14:54 |
jperras |
I've taken to doing the merges in git, even though the endpoint repository is svn. |
| # |
Mar 9th 2009, 14:53 |
alkemann |
with svn, my coworker had to set off a day each time we planned on merging a branch |
| # |
Mar 9th 2009, 14:53 |
jperras |
yeah. it so easy, you actually *use* it |
| # |
Mar 9th 2009, 14:52 |
alkemann |
i love how sweet branching actually is when u have a system that handles them |
| # |
Mar 9th 2009, 14:52 |
jperras |
it takes a bit of getting used to |
| # |
Mar 9th 2009, 14:51 |
alkemann |
im still getting git, but im 100% sold on.. as tempting to go back to svn as it is to drop cakephp for oldschool hacks |
| # |
Mar 9th 2009, 14:51 |
ADmad |
"dev" ? |
| # |
Mar 9th 2009, 14:51 |
alkemann |
and i dont love the name of this branch.. hell to type |
| # |
Mar 9th 2009, 14:50 |
alkemann |
and ppl have branched master.. just drop the forks and recommit to 2.0.x.x |
| # |
Mar 9th 2009, 14:50 |
jperras |
they need to share some sort of common history, of course |
| # |
Mar 9th 2009, 14:49 |
alkemann |
yea that didnt go to well |
| # |
Mar 9th 2009, 14:48 |
jperras |
regardless though, that's how you would go about getting a remote fork/repository other than your master into your remote branches list |
| # |
Mar 9th 2009, 14:47 |
AD7six |
different branch* |
| # |
Mar 9th 2009, 14:47 |
jperras |
ah ok |
| # |
Mar 9th 2009, 14:46 |
AD7six |
jperras: careful ^^ |
| # |
Mar 9th 2009, 14:46 |
AD7six |
alkemann: it wasn't deliberate that I used a different fork |
| # |
Mar 9th 2009, 14:46 |
alkemann |
cant we just drop the fork thing. having master and 2.0.x.x as main dev branch should be good no? |
| # |
Mar 9th 2009, 14:46 |
jperras |
and then you can do a git remote update |
| # |
Mar 9th 2009, 14:46 |
jperras |
alkemann: you need to add his fork as a remote |
| # |
Mar 9th 2009, 14:45 |
AD7six |
oh I'm definitely not the best person to ask/answer that. in short I don't know, I should rebase and reapply it. |
| # |
Mar 9th 2009, 14:44 |
alkemann |
AD7six: bit of a git q, but how do i merge ur forked plugin into the 2.0.x.x branch? |
| # |
Mar 9th 2009, 14:30 |
alkemann |
ADmad: take my partner : https://www.ohloh.net/accounts/ronnyvv - he has 8th even though he has less kudos and less commits to the same project.. seems weird |
| # |
Mar 9th 2009, 14:28 |
AD7six |
alkemann: the 2 biggest factors are other people giving you kudos, and the weight of the projects you commit to |
| # |
Mar 9th 2009, 14:26 |
alkemann |
haha |
| # |
Mar 9th 2009, 14:26 |
ADmad |
AD7six: i dont think so.. i just bully the n00bs to help my ego :) |
| # |
Mar 9th 2009, 14:23 |
alkemann |
anyone know how t he kudos thing is calculated? |
| # |
Mar 9th 2009, 14:22 |
AD7six |
you're |
| # |
Mar 9th 2009, 14:22 |
AD7six |
I was, your more on the ball than you give yourself credit for. |
| # |
Mar 9th 2009, 14:21 |
ADmad |
oh i think you were responding to my earlier statement |
| # |
Mar 9th 2009, 14:21 |
ADmad |
AD7six: you got nothing to show ? f u :P |