=== jamesh__ is now known as jamesh
sidi_I forked a branch, added some commits into my own fork, and I now need to merge new commits from the original parent I forked. What would be the correct command to do this?14:47
fullermdJust 'bzr merge' should do it.14:49
sidi_fullermd, thanks! that did it14:51

Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!