[MERGE] Add documentation about diverged branches and refer to it when pushing fails
nmb at wartburg.edu
Mon Jun 8 06:04:45 BST 2009
Bug 269477 takes issue with an error message from push that suggests
"merge" followed by "push" again, which does nothing, because a merge
must be committed before the branches are un-diverged. In order to
explain this in detail, a new help topic "diverged-branches" was added
and a push that fails because the source and destination have diverged
refers to this help topic.
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
More information about the bazaar