search

ThermoMan / Thermostat-Tracking

Code to track and chart data from the 3M-50 WiFi enabled thermostat
8 stars 10 forks source link

Lerrissirrel newfeatures #25

Closed ThermoMan closed 11 years ago

ThermoMan commented 11 years ago

OK, GitHub has me confused now. It shows that I have a side branch of code copied from Lerrissirrel that has changes that are not yet incorporated into my main branch. So I downloaded both versions and compared them - looking specifically for the places where it says I am missing a line. Those lines of code ARE in the main branch. I have a backup of the repo as it is now (and my own local working copies) so there is no danger of losing code. SO I guess I'll click that big green button and see what happens.

ThermoMan commented 11 years ago

OK, working under the assumption that GitHub will not let me delete someone else's work, I'm going to click the "Delete branch" button to make it go away. I have fully verified that the changes are already in my code.