search

joshmarinacci / ElectronIDE

New web based Arduino IDE
BSD 3-Clause "New" or "Revised" License
246 stars 50 forks source link

Rename settings file #27

Closed chrwei closed 10 years ago

chrwei commented 10 years ago

Change so that settings file is an example. This allows a git pull to not overwrite user settings, and allows a user keeping their settings while have a reference of any new settings that might be added.

mvarrieur commented 10 years ago

I created #29 to do this in a more clean way. I think using the .example file for actual settings is a bit risky, and I don't think it's fully working here? At least it wasn't for me.

chrwei commented 10 years ago

huh, that's not what it looked like when I posted it. seems to be picking up things I committed since then

I'm new to git, should I be branching or something before pull reqs?

mvarrieur commented 10 years ago

If you are planning on adding more features after then yes you should branch before submitting a PR. Sometimes you are just forking once to submit a PR in that case it doesn't hurt to do it from master. If you look at mine #29 you can see it's from a feature branch in my repo because I am adding other stuff to master.

chrwei commented 10 years ago

I'll do that in the future then, thanks. I'll close this one then