| 04:22.22 | *** join/#arl Torhal|work (~torhal_wo@76.164.170.2) |
| 04:22.23 | *** mode/#arl [+o Torhal|work] by ChanServ |
| 17:35.17 | *** join/#arl Ressy (~Ressy@unaffiliated/ressy) |
| 17:35.19 | Ressy | hiyas |
| 17:35.23 | Ackis | howdy :) |
| 17:35.35 | Ressy | I'm only touching neutral/Alliance |
| 17:35.44 | Ressy | I don't have a single horde toon over lvl 1. |
| 17:36.25 | Ressy | I hit the neutral ones earlier. :\ |
| 17:56.22 | pompy | Ressy: please don't push anything to it atm, im trying to clean up the failed merge. (heh, did you notice it was like that before you pushed this morning?) :x |
| 17:57.13 | Ressy | I pulled this morning, and it didn't show anything |
| 17:57.25 | Ressy | so I started working again, and attempted to commit, and things went apeshit |
| 17:58.28 | pompy | i pushed 7.5 hours ago |
| 17:59.13 | Ressy | yeah.. For some reason, I couldn't pull even what Torhal did last night. |
| 17:59.14 | pompy | your engineering changes conflicted with my push from that time when you tried to push. |
| 17:59.31 | Ressy | It seems to be working now tho. :\ |
| 18:00.02 | pompy | well and it said "Merge branch 'master' of git@git.wowace.com:wow/arl/mainline.git" .. when its supposed to say "Merge remote branch 'origin/master'" .. so dunno what your client did on your end :x |
| 18:00.04 | Ressy | Sorry for screwing it up |
| 18:00.51 | pompy | np, im just trying to sort it out, so you might have to rescan whateve ryou have already for the last 2 hours! idk. |
| 18:01.05 | Ressy | I've been keeping an eye on it.. |
| 18:01.11 | Ressy | I'll avoid engineering for now. >.< |
| 18:01.54 | Ackis | I blame gnomes |
| 18:02.52 | Ressy | i blame me.. :\ sorry |
| 18:04.19 | Ackis | Ressy: the amount of times I've fucked the database up/commits up cannot be counted it's so high :D |
| 18:11.14 | pompy | I'll be polite and clearly not say anything to that! |
| 18:19.43 | Ackis | :P |
| 18:25.56 | Ressy | how do I do a trainer dump? |
| 18:26.57 | Ressy | herp. got it |
| 18:27.01 | Ressy | I was missing an s |
| 18:27.02 | Ressy | >.< |
| 18:29.04 | Ressy | I do love textpad... Can undo past a save. |
| 18:31.27 | Ackis | I use notepad++ on a windows machine |
| 18:32.41 | Ressy | I think textpad has a .lua & .wiki addition to it.. |
| 18:32.45 | Ressy | but I haven't tried'em |
| 18:34.30 | Ressy | does it have a document tab to easily switch between files? |
| 18:34.50 | Ackis | yeah |
| 18:35.46 | Ressy | interesting... |
| 18:35.50 | Ressy | It looks a lot like textpad. |
| 18:37.51 | Ackis | I loves it |
| 18:39.08 | Ressy | would prolly take too long to get used to another program.. I've been using this one for years on end now |
| 18:40.19 | Ackis | yeah I know what you mean |
| 18:56.50 | pompy | Ressy: just make sure that after you commit locally, that you pull before you push. |
| 19:01.06 | Ressy | kk |
| 20:43.28 | Ressy | everything dumps properly except engineering |