[bug 0.11] commit succeeds with conflict markers in the file

[Jari Aalto]

John Arbash Meinel <john at arbash-meinel.com> writes:

> Jari Aalto wrote:
> > Consider this
> > 
> >     $ bzr merge ../a
> >     <conflict, hack, hack, remove unneeded files>
> >     $ bzr resolved file.txt
> >     $ bzr ci -m "Done"
> > 
> > Ah, but there still was left confluct markers that escaped the eyes of
> > the developer, who *thought* all was resolved, when it was not:
> 
> I think what we actually worked out was to make 'bzr resolve' not
> resolve a file if <<< is detected.

Thank you, exactly to the point. Can we hope that to be in 0.13?

Jari