Resolving a content conflict
Paul.Schauble at ticketmaster.com
Wed Sep 24 03:22:31 BST 2008
It did not leave a file x.y in the appropriate directory. Only the base,
this, other set.
From: bazaar-bounces at lists.canonical.com
[mailto:bazaar-bounces at lists.canonical.com] On Behalf Of Ben Finney
Sent: Tuesday, September 23, 2008 7:10 PM
To: bazaar at lists.canonical.com
Subject: Re: Resolving a content conflict
"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.
> bzr: ERROR: Could not rename x.y.this => x.y: x.y.this is not
> I give up. What should I have done?
You should make the original file 'x.y' contain the content you want;
that is, take pieces from each of 'x.y.BASE', 'x.y.THIS', 'x.y.OTHER'
as appropriate and make your chosen rendition of 'x.y'.
If one of those three is entirely what you want for 'x.y', you can
simply copy it to 'x.y'.
Regardless, Bazaar will observe that *altered content* of 'x.y' as a
change made by you for the merge. Once you've resolved the conflict,
'bzr resolve x.y' will tell Bazaar this, and it will remove the
When all the conflicts are resolved, you 'bzr commit' the changes,
which will include the merge and your manual alterations to the files.
\ "Whenever you read a good book, it's like the author is right |
`\ there, in the room talking to you, which is why I don't like to |
_o__) read good books." -Jack Handey |
More information about the bazaar