Update all repos fails

[CliffH]

In the VM+0.5, when I execute the Update all repos icon, I get the following error:

Updating /home/bitcraze/projects/crazyflie-firmware
Updating bbae9a9..ead7f60
error: Your local changes to the following files would be overwritten by merge:
Makefile
Please, commit your changes or stash them before you can merge.
Aborting

How do I fix this? I haven't made any changes to the firmware, although I have looked at a few source files.

[chad]

Double-click the "Terminal Emulator" icon on the desktop and enter the following three commands:

Code: Select all

cd ~/projects/crazyflie-firmware
git checkout -- Makefile
git pull

That should fix it and bring the crazyflie-firmware repository up-to-date.