search

duckietown / duckietown-shell-commands

Commands for the Duckietown Shell
4 stars 4 forks source link

dts update error #360

Open jesima31 opened 1 year ago

jesima31 commented 1 year ago

dts update gives me the following error

image

My git is updated as well

image

afdaniele commented 1 year ago

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 commented 1 year ago

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 commented 1 year ago

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