Redo a merge.


bzr remerge [FILE...]

-v, --verbose

Display more information.


Reprocess to reduce spurious conflicts.

-q, --quiet

Only display errors and warnings.


Show usage message and options.


Show base revision text in conflicts.

-h, --help

Show help message.

Merge algorithm:

Select a particular merge algorithm.


Merge using external diff3


LCA-newness merge


Native diff3-style merge


Weave-based merge


Use this if you want to try a different merge technique while resolving conflicts. Some merge techniques are better than others, and remerge lets you try different ones on different files.

The options for remerge have the same meaning and defaults as the ones for merge. The difference is that remerge can (only) be run when there is a pending merge, and it lets you specify particular files.


Re-do the merge of all conflicted files, and show the base text in conflict regions, in addition to the usual THIS and OTHER texts:

bzr remerge --show-base

Re-do the merge of “foobar”, using the weave merge algorithm, with additional processing to reduce the size of conflict regions:

bzr remerge --merge-type weave --reprocess foobar

Previous topic


Next topic


This Page