Resolving a content conflict

[Robert Collins]

On Tue, 2008-09-23 at 18:12 -0700, Paul Schauble wrote:
> 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

The .BASE etc files are not versioned. There is no need to 'bzr mv'
anything.

Just 'bzr resolve' after you have x.y looking as you want it to.

-Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080924/0dc1a98b/attachment.pgp