Wiki Tools

  • Find Page
  • Recent Changes
  • Page History
  • Attachments

Two branches from a common ancestor are considered to be 'diverged' if either or both have received independent commits that have not been merged into the other.

If two branches have diverged, one branch can not push into or pull from the other branch, unless any non-merged commits in the destination branch are merged into the source first, or they are discarded/overwritten.

In Bazaar, a push or pull command will fail if the source and destination branches have diverged leaving the destination with non-merged commits, unless --force is used, in which case any non-merged commits in the destination are overwritten.