[01:00] greg-g: http://www.renaissancewoodworker.com/jeffs-dining-table-part-1/ [02:39] Hello all [02:39] howdy [02:39] Can someone help me with some GIT? Testing things out to merge files and resolve conflicts [02:40] I can't find anything that is really useful [02:40] GitHub won't merge the files because of conflicts [02:40] I can do a git diff on the files [02:40] how do I merge lines over? [02:41] you edit the files [02:41] and then resolve them with git add XX [02:41] So I can't do a diff and merge only parts of files over via the command line? [02:42] So, what? Go into my file and add in those lines? [02:42] well I guess how did you get to where you are now? [02:44] My buddy and I are making changes via Notepad++ and then in command line we are adding and then committing. He went into GitHub and sent me a Pull Request. Then I went into GitHub and looked at it there but couldn't do a merge on it. It gave me instructions to merge but it won't because of conflicts. I want to go through the conflicts to merge the documents [02:46] jcastro: ping [02:46] yo [02:46] http://paste.mitechie.com/show/880/ mean anything to you? [02:46] searching if my ec2 isn't setup right or not [02:47] looks like you need to send the charm some config options [02:47] ok, don't see it in the charm but wondered if it was charm or env for bringing something up [02:47] thanks [02:47] I think that's a charm thing [02:47] pretty sure [02:47] jcastro: cool thanks [02:47] oh nice work ubuntu, blank readmes [02:48] yea :( [02:48] see if negronjl is on #juju [02:48] trying to charm something of my own [02:48] he's west coast and usually around [02:48] whatcha charmin? [02:48] but going to try to set it up on ec2 [02:48] http://r.bmark.us/ first [02:48] and if it goes well I'll try to do bookie [02:49] I would try [02:49] hmm [02:49] why would you have userpass auth [02:49] sanitize and show me your environments.yaml pls [02:50] yea, and redis-master has no config file [02:50] indeed [02:50] did you try on a non-t1 micro? [02:50] jcastro: https://pastebin.canonical.com/83953/ [02:50] jcastro: no, didn't yet. [02:51] same error if I leave off the constraint [02:51] default: canonistack is your problem [02:51] you need to -eec2 to your original command [02:51] to use your ec2 env [02:51] ah bah, remembered the -e on bootstrap but not on the deploy [02:51] instead of your canonistack [02:51] yep [02:51] thanks [02:51] one trick juan does is implement a bash alias to set the JUJU_ENVIRONMENT variable [02:52] so he can skip the -e thing and just switch between environments as a whole [02:52] makes sense [02:52] shakes808: ok, so the idea here is that he's got a branch up you want to merge [02:53] but it's got conflicts [02:53] so what you want to do is create a local branch [02:53] git checkout -b pull_friends_stuff [02:53] and then you want to merge his branch into yours and get all the conflicts [02:53] git merge git://path..to..hhis..branch branchname [02:54] and then resolve the conflicts, change over to master, merge your pull_friends_stuff and then push master back up [02:54] don't try to keep with the github gui. It's nice and all but as you're finding it doesn't help [02:55] bah, sniped on ebay again [02:55] ok well...must walk away [03:02] rick_h: Trying to go through some scenarios and trying to figure this stuff out [03:02] lol [03:02] bring it to CHC? [03:02] I was trying to do testing with myself and merging stuff but never really go conflicts [03:02] I might be able to show up. [03:02] for a little bit [03:03] up to you, might be easier to figure out [03:04] I will hop on IRC during the day and let you know. It will be much easier. [03:20] You have a good night and I will most likely be there tomorrow [04:52] Evening [05:31] rick_h_: cool intro video. Thanks [11:24] greg-g: yea thuoght maybe this 'get into woodworking week' stuff might be of interest [11:24] nothing about spoons :/ lol [13:23] Good morning [13:24] I can't imagine spoons are that easy to make [13:24] Seems like a lot of sanding [13:24] naw [13:24] lots of carving [13:24] who needs sanding [13:25] I don't want splinters from my spoon [13:30] wimp :P [13:33] Good morning all [13:34] Good morning one [14:12] :D [14:12] party [14:12] used Blazeix's fancy link now in the CHC announcements. Thanks Blazeix! :) [14:43] w000t [14:44] whoa [15:19] greg-g: lol the world is crazy https://twitter.com/simonw/status/299165514033418241 [15:20] You could 3D print spoons [15:20] except for the 'wood' part [15:21] * brousch looks into wood-grain 3d printing [15:21] *sigh* [16:19] hah, crazy thing of the day http://docs.topazruby.com/en/latest/blog/announcing-topaz/ [16:21] no, but you could certainly use a different CAM for wood spons [16:21] *spoons [16:30] rick_h_: That hurts my mind [17:56] http://www.slideshare.net/dberkholz/assholes-are-killing-your-project-fosdem [17:56] rick_h_: awesome! [17:58] snap-l: lol [17:58] *sigh* .... I'm going to have a field day with my wife now. This is why we don't give out emails. [17:58] just got a giant CC email from my son's day care with everyone in the CC [18:02] at first I thought you meant my current employer :) [18:02] lol [18:02] so now my reply 'confirmation' has to be a lesson no BCC vs CC and wtf it means to want to keep my information private. [18:02] *double sigh* [18:03] rick_h_: Give up [18:05] http://programmingisterrible.com/post/42432568185/how-to-parse-ruby [18:35] rick_h_: I once worked for Eaton back in the days of the "ISO 9000" craze. About once a week, some salesperson in some distant division would email "everyone" that one of their favorite vendors received ISO 9000 certification. A few dozen recipients would reply "WTF do I care?" via "reply all". Mail servers would collapse for a few hours. [20:47] http://vimcasts.org/blog/2013/02/habit-breaking-habit-making/ [20:48] I'm not sure I agree this is a bad habit [20:48] but then again, I have many finely grained bad habits [21:59] I did that to get me onto hjkl [21:59] I nop'd the arrows [23:55] http://blog.magnatune.com/2013/02/iphone-app-for-background-music-for-restaurants-and-businesses.html