error: Your local changes to the following files would be overwritten by merge: scripts/create-rootfs-usb-update-image Please, commit your changes or stash them before you can merge. Aborting Updating 8a678ee..1dbeec2 [Mon Apr 9 03:30:05 CEST 2018] Preparation for dev build failed