[Success!] [MERGE][269477] Add documentation about diverged branches and refer to it when pushing fails

[Bundle Buggy]

This change has been merged.
Previous status: Approved

For details, see: 
http://bundlebuggy.aaronbentley.com/project/bzr/request/%3C4A2C9BED.1020501%40wartburg.edu%3E
Project: Bazaar