[20:18] <wolter> Hi, I'm having problems merging two different branches; From the branch I'm working on I run bzr merge lp:otherbranch, but I get as output "Nothing to do."