bzr resolve

[Bosco Rama]

On 07/25/12 19:12, John Meinel wrote:
> Plain 'bzr resolve' actually marks all files without conflict markers as
> resolved. As a convenience it also reports what files remain conflicted.
> 'bzr resolve foo' is a way to force a file that looks like it has a
> conflict marker as really resolved.
> If you just want the conflicts, there is 'bzr status' and 'bzr conflicts'.

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:

Unchanged 1
<<<<<<< TREE
Conflict Test Change 1
=======
Conflict Test Change 2
>>>>>>> MERGE-SOURCE
Unchanged 2

with no indication that the file had obviously not had its conflicts resolved.

Bosco.