dts update error

[jesima31]

dts update gives me the following error

My git is updated as well

[afdaniele]

Can you run the following command and report the output?

git -C /home/jesima/.dt-shell/commands-multi/daffy pull --recurse-submodules origin daffy

[mdlugosz-agh]

I have the same problem. In my case output command
git -C /home/jesima/.dt-shell/commands-multi/daffy pull --recurse-submodules origin daffy
is
From https://github.com/duckietown/duckietown-shell-commands
* branch daffy -> FETCH_HEAD
Updating 73572c9..bf5f275
error: Your local changes to the following files would be overwritten by merge:
stack/stacks/duckietown/duckiebot.yaml
Please commit your changes or stash them before you merge.
Aborting

I do not remember that I modify file duckiebot.yaml

[mdlugosz-agh]

In my case
git restore stack/stacks/duckietown/duckiebot.yaml
resolve problem