It's not a bug per se in ucf that the three-way merge fails; it's not possible to have a 100% correct automated three-way merge, so ucf must error out in some situations and leave it up to a human to manually merge changes. And if a particular package presents merging problems with unacceptable frequency, that package shouldn't use ucf --three-way.
So the question is why the merge failed for you in this case. To answer that, we need the smb.conf and smb.conf.ucf-new files requested by Jean- Baptiste. ** Changed in: samba (Ubuntu) Sourcepackagename: ucf => samba -- package samba failed to install/upgrade: Conflicts found! Please edit `/etc/samba/smb.conf' and sort them out manually. https://bugs.launchpad.net/bugs/293539 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
