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

#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?

We will be away from Thursday July 17 to Monday July 21. Orders placed after 3pm EST July 17
will be shipped on Tuesday July 22. Thank you for your understanding!
This is default text for notification bar