Bazaar

Bazaar

 




Wiki Tools

  • Find Page
  • Recent Changes
  • Page History
  • Attachments

Merging is the process of applying all the changes that were introduced in one branch into another branch, without applying any changes that are already common to both branches. Sometimes a user will not want all of the changes. For these cases, a user may instead prefer a cherrypick, which gives the user the option to apply only those revisions that are wanted.

As well as altering the working tree, bzr's merge command will also get all of the revisions that a branch has, and add metadata indicating that a merge has been performed.