Comment 5 for bug 539504
Revision history for this message
| Aaron Bentley (abentley) wrote Re: [Bug 539504] [NEW] Please document interaction between bzr and u1 | #5 |
© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
4b6b663
demo site
(Get the code!)
Emmet Hikory wrote:
> Public bug reported:
>
> Please document how u1 and bzr interact, most likely generalised.
My summary is: avoid storing bzr branches on u1.
I tried it, and it kept creating conflicts. On machine A, I'd resolve
them in favour of machine B, and this would produce new conflicts on
machine B. I'd resolve them on machine B and get conflicts on machine
A. Ad infinitum.
Aaron