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'. John =:-> <div class="gmail_quote">On Jul 25, 2012 5:35 PM, "Bosco Rama" <<a href="mailto:bzr@boscorama.com" target="_blank">bzr@boscorama.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> 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? TIA Bosco. </blockquote></div>