bzr resolve

[Ben Finney]

Bosco Rama <bzr at boscorama.com> writes:

> It's not the conflicts I was worried about.  It's the ability to stop a
> conflicted file from having the 'committed' version looking like this:

The way to stop that is not to use ‘resolve’ in that case. By using that
command, you're telling Bazaar that you know the conflict is resolved,
regardless of Bazaar's opinion.

-- 
 \       “The fundamental principle of science, the definition almost, |
  `\             is this: the sole test of the validity of any idea is |
_o__)                                 experiment.” —Richard P. Feynman |
Ben Finney