error: Your local changes to the following files would be overwritten by merge: targets/fieldtest/rootfs/common.inc Please, commit your changes or stash them before you can merge. Aborting Updating 6f84011..7d1ad9d [Fr 18. Sep 12:00:44 CEST 2020] Preparation for dev build failed