Resolving a content conflict

[Paul Schauble]

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. The correct file was other, so
I copied other over this and did

Bzr mv x.y.this x.y

 

And received the error message

 

bzr: ERROR: Could not rename x.y.this => x.y: x.y.this is not versioned.

 

I give up. What should I have done?

 

    ++PLS

-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20080923/f724baa6/attachment-0001.htm