* admin/notes/bzr: Add an idiot's guide to merging between branches.