[07:26] <anilg> Hi.. is there a good resource that explains bzr's 3 way merging? I will be editing the ubuntu-doc and put them into a new bzr repo, so want to be able to easily merge the changes that go into the original ubuntu-doc repo
[07:33] <anilg> also what editor do you use to edit the xml files?
[14:34] <kagou> Hi
[14:35] <kagou> i believe that ubuntu packaging guide was available on yelp. But in Intrepid i can't find it or a package. Am I wrong ?
[18:45] <anilg> [repeating from earlier] is there a good resource that explains bzr's 3 way merging? I'll be editing the ubuntu-doc and put them into a new bzr repo, so want to be able to easily merge the changes that go into the original ubuntu-doc repo
[18:45] <anilg> also what editor is used to edit the xml files?
[21:09] <mdke> evening all
[21:09]  * mdke is back online after a week off
[21:34] <Atamira> wb
[21:56] <mdke> Rocket2DMn: delete, I think.
[21:56] <Rocket2DMn> lol, 3 days later
[21:56] <Rocket2DMn> which page was that again?
[21:57] <Rocket2DMn> ah right NeedsExpansion
[21:59] <mdke> yeah
[22:08] <Rocket2DMn> ok ill try to delete it
[22:10] <Rocket2DMn> cool, it worked mdke , thanks