On Tue, Jun 8, 2010 at 5:53 PM, Jelmer Vernooij <[email protected]> wrote: > This happens when you import from two sources with different file ids. > Bazaar doesn't recognize that two files (even though they have the same > path) are the same and will generate these conflicts.
Thanks! I filed https://bugs.edge.launchpad.net/udd/+bug/591476 to ask for the imports to be fixed up so that merges work more smoothly, and have just done a manual merge for now. -- Elliot Murphy | https://launchpad.net/~statik/ -- ubuntu-distributed-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel
