I experienced the same issue. I tried a combination of methods to resolve the file. First I looked at the diff, but I don't normally read diffs, so I looked for another way. The 3 way diff seemed to have more relevant information, and I was ok with what it returned, so I tried the 3 way merge. I lost the dialog at that time ( I think it crashed ), but I think another one popped up. So, I tried to open a new command shell. The application APPEARED to stop responding, and went dark, as non- responding apps can when running in compiz. However, on closer examination, there was now and interactive # prompt in the details of the update application. After exiting that prompt, the app was live again, and I I told it to just keep the old file. After doing this, there was a failure to update the remaining samba packages.
-- package samba-common 2:3.2.3-1ubuntu3 failed to install/upgrade: subprocess post-installation script returned error exit status 1 https://bugs.launchpad.net/bugs/281569 You received this bug notification because you are a member of Ubuntu Server Team, which is subscribed to samba in ubuntu. -- Ubuntu-server-bugs mailing list Ubuntu-server-bugs@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-server-bugs