"Merging in !bzr: The #git approach vs the #bzr approach (or, why explicit merges, a mainline, and merge direction are important)": http://toykeeper.net/tutorials/bzr-vs-git/