resolve

Purpose:

Mark a conflict as resolved.

Usage:

bzr resolve [FILE...]

Options:

--all	Resolve all conflicts in this tree.
-v, --verbose	Display more information.
-q, --quiet	Only display errors and warnings.
-d ARG, --directory=ARG
	Branch to operate on, instead of working directory.
--usage	Show usage message and options.
-h, --help	Show help message.

action:

--action=ARG	How to resolve the conflict.
--done	Marks the conflict as resolved.
--take-other	Resolve the conflict taking the merged version into account.
--take-this	Resolve the conflict preserving the version in the working tree.

Description:

Merge will do its best to combine the changes in two branches, but there are some kinds of problems only a human can fix. When it encounters those, it will mark a conflict. A conflict means that you need to fix something, before you can commit.

Once you have fixed a problem, use “bzr resolve” to automatically mark text conflicts as fixed, “bzr resolve FILE” to mark a specific conflict as resolved, or “bzr resolve –all” to mark all conflicts as resolved.

Aliases:

resolved

See also:

conflicts