Comment 11 for bug 113809

As a user, this is also the reason I never use "bzr up" even in checkouts. It would be nice if "bzr update" could just print an error if the local branch has diverged from the master branch when updating and suggest the user some options: bzr merge <master-url>, bzr merge --swap <master-url>, bzr rebase <master-url>. That way it never has to do two merges itself.