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

[Aaron Bentley]

Aaron Bentley has voted approve.
Status is now: Approved
Comment:
I'll merge

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