=== jamesh__ is now known as jamesh [14:47] 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] Just 'bzr merge' should do it. [14:51] fullermd, thanks! that did it