error: The following untracked working tree files would be overwritten by merge:
boot/overlays/waveshare32b-overlay.dtbo
boot/overlays/waveshare35a-overlay.dtbo
boot/overlays/waveshare35b-overlay.dtbo
boot/overlays/waveshare35cpld-overlay.dtbo
Please move or remove them before you can merge.
Aborting
Could you explain a little better what you did?
In the other thread you said he should remove the waveshare dtbos.
But I need them as waveshare user, don’t I?
OK got it to update thank you. but now after the update zynthian won’t boot it just gets to the white error screen… have tried different combinations in Web configuration with no joy.?