OpenSprinkler › Forums › Hardware Questions › OpenSprinkler Beagle (OSBo) › New install of OSB0 V1.1 – some challenges › Re: Re: New install of OSB0 V1.1 – some challenges
October 2, 2014 at 4:18 pm
#28409
maddox
Member
I looked closer and found that git pull had an error:
sudo git pull
Updating e6754ec..ed45985
error: Your local changes to the following files would be overwritten by merge:
ospi.py
plugins/mobile_app.py
plugins/weather_adj.py
Please, commit your changes or stash them before you can merge.
Aborting
I killed the task ospi.py, but still get the error – any thoughts on how to correct the error and truly upgrade the app?