Hi, Here is the log of the chatroom at http://community.hackit.cx/chat/ for the 07/10/2010.
06:41:45 <> Kalhaan joins Farsides 07:20:21 <> Kalhaan joins Farsides 07:50:41 <> da joins Farsides 07:51:44 <da> Kalhaan quit (timeout) 09:00:57 <da> Kalhaan quit (timeout) 10:08:24 <da> test 10:14:22 <> Illya joins Farsides 10:30:54 <Illya> Kalhaan quit (timeout) 10:31:41 <Illya> da quit (timeout) 10:48:49 <Illya> Hello 11:24:51 <> Kalhaan joins Farsides 11:25:01 <Kalhaan> Hi! 11:47:56 <Illya> can you tell me how to merge all code? 11:49:00 <Kalhaan> You mean to get back my changes and merge them into yours? 11:51:47 <Kalhaan> Here are three links that can help you understand more: 11:51:50 <Kalhaan> http://doc.bazaar.canonical.com/latest/en/user-guide/merging_changes.html 11:52:01 <Illya> thanks 11:52:18 <Kalhaan> and about distributed CVS in general: 11:52:19 <Kalhaan> http://betterexplained.com/articles/intro-to-distributed-version-control-illustrated/ 11:52:25 <Kalhaan> http://hginit.com/top/ 11:52:37 <Kalhaan> (it's about mercurial, but the same principles apply) 12:04:06 <Illya> ok. Thanks. Another question - can you tell me how I can use OWA? As i understand I have to register there and only after this I can generate a JS code for implementing on pages. Am I right? 12:26:45 <Kalhaan> OWA is a software - so you will have install an instance on your machine first 12:27:25 <Kalhaan> http://www.openwebanalytics.com/?page_id=3 for download 12:27:54 <Kalhaan> http://wiki.openwebanalytics.com/index.php?title=Installation Installation instructions 12:28:21 <Kalhaan> And then yes, you will be able to generate the code for implementing on pages 12:28:50 <Illya> Ok, Thanks a Lot! 12:28:54 <Kalhaan> Actually, you will get PHP hooks to put (they offer more flexibility than JS hooks) 12:29:06 <Kalhaan> you're welcome : ) 12:29:33 <Illya> so about merging 12:30:37 <Illya> I have checkput from my branch to my local copy, than I have to checkout your branch to my local copy ? 12:35:41 <Kalhaan> yes - from within you local copy of your branch, you type "bzr merge lp:cardstories" 12:37:36 <Illya> ok, but as I understand the final merging to trunk - it's only in you submission. Isn't it? 13:12:22 <Kalhaan> Yes 13:13:13 <Kalhaan> Basically, I merge your launchpad repository into mine, and then I push to the trunk - which allows to check the code in the process 13:13:48 <Kalhaan> But when you push your versions, you need to address conflict beforehand 13:14:26 <Kalhaan> Basically, while you code, you keep merging new changes to the trunk into yours, to make sure you don't divert too much 15:33:56 <Kalhaan> Illya quit (timeout) _______________________________________________ Farsides mailing list - [email protected] Wiki: http://farsides.com/ List: http://farsides.com/ml/ Forum: http://farsides.com/forum/ Ideas: http://farsides.com/ideas/ Chat: http://farsides.com/chat/
