In fact, after some Googling I can pretty much guarantee that Corey at least is running into a problem that is not inherent to Amarok. Those TREE and MERGE-SOURCE labels are put in by Bazaar, the Canonical SCM system:
So I don't know what file QSettings is complaining about (you may want to do a 'find | xargs grep TREE' in ~/.kde but this problem may be even deeper, down to packages built with badly merged files. Since it seems to be affecting people now running at least three different versions of Amarok, I'm guessing it's a KDE or Qt package.
I'm leaving this in Ubuntu hands. I'll keep watching the thread, but there's nothing I can do about this.
In fact, after some Googling I can pretty much guarantee that Corey at least is running into a problem that is not inherent to Amarok. Those TREE and MERGE-SOURCE labels are put in by Bazaar, the Canonical SCM system:
https:/ /bugs.launchpad .net/bzr/ +bug/36399
So I don't know what file QSettings is complaining about (you may want to do a 'find | xargs grep TREE' in ~/.kde but this problem may be even deeper, down to packages built with badly merged files. Since it seems to be affecting people now running at least three different versions of Amarok, I'm guessing it's a KDE or Qt package.
I'm leaving this in Ubuntu hands. I'll keep watching the thread, but there's nothing I can do about this.