Bazaar Merge Action

This action enables you to merge one branch into another.

Merge From

The branch to merge from. This branch will not be modified.

Merge To

The branch to merge into. This branch will be changed to the result of the merge.

Algorithm

The algorithm to use for the merge. Default is usually merge3.

diff3: Merge using external diff3

lca: LCA-newness merge

merge3: Native diff3-style merge

weave: Weave-based merge

Force

Merge even if the destination tree has uncommited changes.

Merge Uncommited Changes

Apply uncommited changes from a working copy, instead of branch changes.