search

cnlohr / esp82xx

Useful ESP8266 C Environment
Other
288 stars 107 forks source link

Typo #58

Closed bbkiwi closed 7 years ago

bbkiwi commented 7 years ago

Hi @con-f-use 

 I'm an absolute noob with git. I've spent all this time while you have been working away,

to get my repo up to date with the most recent changes. Still one typo introduce. So this pull and the one I will make for dev too. Cheers, Bill

con-f-use commented 7 years ago

Yeah no problem. It's not a git thing, it's a project organisation thing. Most project have a master branch for (official, tested code that only incorporates big changes) and a dev branch where you make your changes and test them until they are ready to go into master. Some even use a branch for every new feature plus one for urgent hotfixes.

I just want to avoid spamming the master branch with "Typo here", "Typos there", "Typos everywhere" kind of commits. Or small changes like "I made this button say >Okay< instead of >Ok<".

If you want your ESP project to be up to date with Charles' you should just clone it freshly again. If you didn't edit anything in the esp82xx folder and rather just copied the files to the top-level (as intended), you shouldn't loose a thing. Make a backup though.