Resolving a content conflict

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Ben Finney wrote:
> "Paul Schauble" <Paul.Schauble at ticketmaster.com> writes:
> 
>> The section on content conflicts in the Bazaar reference is very
>> confusing.
>>
>>  
>>
>> After an update, I had a conflict on file x.y.  Bazaar created three
>> files, x.y.base, x.y.this, and x.y.other.
> 
> It also, you'll note, left the file 'x.y', with altered content to
> indicate where the conflicts occur.

In a text conflict, yes.  But not in a content conflict.

Content conflicts are caused by changes to non-text items, e.g. binary
files, deletions, kind changes, etc.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFI2aU+0F+nu1YWqI0RAhnHAJwPdMcL8vqAvKEhyu9AK6VP5N6lowCePic4
4LR8ZNTIvPaOgv3kg0f3QHA=
=pKTh
-----END PGP SIGNATURE-----