<div dir="ltr"><div>I've updated the deconflictor now</div><div><br></div><div><a href="https://build.neon.kde.org/job/test_kf6_deconflictor/lastSuccessfulBuild/artifact/conflict-report.json/*view*/">https://build.neon.kde.org/job/test_kf6_deconflictor/lastSuccessfulBuild/artifact/conflict-report.json/*view*/</a></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Tue, 2 May 2023 at 09:35, David Edmundson <<a href="mailto:david@davidedmundson.co.uk">david@davidedmundson.co.uk</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">On Fri, Apr 28, 2023 at 5:59 PM Jonathan Riddell <<a href="mailto:jr@jriddell.org" target="_blank">jr@jriddell.org</a>> wrote:<br>
><br>
> The deconflictor job we run in neon still has a bunch of files overlapping between kf5 and kf6<br>
><br>
> <a href="https://build.neon.kde.org/job/test_kf6_deconflictor/" rel="noreferrer" target="_blank">https://build.neon.kde.org/job/test_kf6_deconflictor/</a><br>
><br>
> <a href="https://build.neon.kde.org/job/test_kf6_deconflictor/9/artifact/conflict-report.json/*view*/" rel="noreferrer" target="_blank">https://build.neon.kde.org/job/test_kf6_deconflictor/9/artifact/conflict-report.json/*view*/</a><br>
><br>
> Is there any progress being made in fixing this?<br>
<br>
Any, yes.<br>
Obviously it's not done yet.<br>
<br>
I'm not sure this report is up to date:<br>
<br>
    "/usr/kf6/bin/kglobalaccel5",<br>
    "/usr/bin/kglobalaccel5"<br>
<br>
I can't see us installing that.<br>
<br>
> We'd like to move the neon packages into /usr which would break our deconflicting report job.<br>
<br>
You know how to make progress faster :)<br>
<br>
> Jonathan<br>
><br>
</blockquote></div>