resolve
=======

:Purpose: Mark a conflict as resolved.
:Usage:   bzr resolve [FILE...]

:Options:
  --usage        Show usage message and options.
  --all          Resolve all conflicts in this tree.
  -v, --verbose  Display more information.
  -q, --quiet    Only display errors and warnings.
  -h, --help     Show help message.

: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 should 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: :doc:`conflicts <conflicts-help>`


