Resolving a content conflict
Paul.Schauble at ticketmaster.com
Wed Sep 24 03:33:58 BST 2008
Which bring us back ot my original question. I want the .other file. Do
I just rename x.y.other to x.y using the OS commands? Or what?
From: bazaar-bounces at lists.canonical.com
[mailto:bazaar-bounces at lists.canonical.com] On Behalf Of Aaron Bentley
Sent: Tuesday, September 23, 2008 7:26 PM
To: Ben Finney
Cc: bazaar at lists.canonical.com
Subject: Re: Resolving a content conflict
-----BEGIN PGP SIGNED MESSAGE-----
Ben Finney wrote:
> "Paul Schauble" <Paul.Schauble at ticketmaster.com> writes:
>> The section on content conflicts in the Bazaar reference is very
>> 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.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
-----END PGP SIGNATURE-----
More information about the bazaar