[dss-merge-requests] Dev build failure

oebuild at builder.localdomain oebuild at builder.localdomain
Mon Apr 11 13:26:55 CEST 2022


>From ssh://git.digitalstrom.org:16022/dss-oe/dss-oe
   c8d73a5..be7b051  master     -> origin/master
   d8602b4..9269bb5  MR_patch_reflash_rootfs -> origin/MR_patch_reflash_rootfs
error: Your local changes to the following files would be overwritten by merge:
	scripts/create-rootfs-usb-update-image
	utilities/kiss-release.sh
	utilities/kiss-usb-update.sh
Please, commit your changes or stash them before you can merge.
Aborting
Updating c8d73a5..be7b051
[Mo 11. Apr 13:26:55 CEST 2022] Preparation for dev build failed


More information about the dSS-merge-requests mailing list