jose | wgrant: hey, is there any reason why Launchpad kills my connection after trying to branch lp:lp? | 03:50 |
---|---|---|
jose | it doesn't even finish (it's too big) | 03:50 |
=== lazypower-travel is now known as lazyPower | ||
zonovroman | Hello all. | 17:45 |
zonovroman | Somebody proposed for merging in my private branch. | 17:45 |
zonovroman | How I can merge his changes? | 17:45 |
cjwatson | zonovroman: If you go to the merge proposal page (with +merge in the URL, should be in the e-mail to you) then it shows a suitable "bzr merge" command that you can run in your branch and then commit and push. | 19:04 |
cjwatson | zonovroman: Also http://doc.bazaar.canonical.com/bzr.dev/en/user-guide/merging_changes.html | 19:05 |
=== jjox` is now known as jjox | ||
=== Purefan_ is now known as slackner |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!