Resolving a content conflict

[Aaron Bentley]

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

Paul Schauble wrote:
> 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?

No, x.y.OTHER is the one that is versioned.  If you run "bzr status" you
should see a rename of "x.y => x.y.OTHER".

You should "bzr mv x.y.OTHER x.y".  And then do "bzr resolve x.y" (or
"bzr resolve --all" if all other conflicts have been resolved).

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

iD8DBQFI2agy0F+nu1YWqI0RAm8DAJ9LwLjM0QzgP33wuk6jxm3PKJXNtACfXmlk
gYlAUU4wvAYekUD9en6lRPc=
=yrpS
-----END PGP SIGNATURE-----