[dss-merge-requests] Dev build failure

[oebuild at builder.localdomain]

>From ssh://git.digitalstrom.org:16022/dss-oe/dss-oe
   24c4c38..ff6c7f7  master     -> origin/master
   8f848cd..0d599f6  MR_add_protoc_to_toolchain -> origin/MR_add_protoc_to_toolchain
error: Your local changes to the following files would be overwritten by merge:
	yocto/dS/meta-digitalstrom-rescue-devel/recipes-support/swupdate/swupdate_%.bbappend
Please, commit your changes or stash them before you can merge.
error: The following untracked working tree files would be overwritten by merge:
	yocto/dS/meta-digitalstrom-rescue-devel/recipes-support/swupdate/swupdate/statvfs_ramfs_report_not_free_space.patch
Please move or remove them before you can merge.
Aborting
Updating 24c4c38..ff6c7f7
[Fri Jun 10 01:30:06 CEST 2022] Preparation for dev build failed