[14:47] <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:49] <fullermd> Just 'bzr merge' should do it.
[14:51] <sidi_> fullermd, thanks! that did it