bzr resolve

Bosco Rama bzr at
Wed Jul 25 22:34:21 UTC 2012

Hi again,

Quick (newbie?) question about bzr resolve.  When issued without
a file argument it lists the outstanding conflicts within a branch.
If issued with a file argument it tags the conflict as resolved and
cleans up the file versions even if there are outstanding conflict
markers within the file.  Is this expected behavior?  I can see this
being the case if I added the '--done' option but we got a bit of a
surprise when the files ended up 'resolved' with embedded markers
and mangled changes.

Is there a config option or argument we can use to make resolve balk
if there are extant conflict markers?



More information about the bazaar mailing list