Add _Contrast variable to BitWizardLcd, to be able to use the variable (...

[Theuno]

...as with _Backlight)

Minor improvement

[ghost]

Hi,

Interesting add on. This does however mess up my sync with git since I am not used to work with multiple contributors. I have a fairly amount of changes which are not pushed to git yet. I normally push my changes and that's it. If I do that now will I overwrite this? Or how do I properly merge this with my (local) changes the proper way?

I had a similar issue a while ago and it totally messed up my sources when I tried to sync the git contribution. It took me a while to rewrite a lot of things and get it all back in sync.

It might sound stupid, but I am not really in the mood to dig into git and all it's commands to find the proper ones. Any help on this issue would be great!

Verstuurd vanaf mijn iPad

Op Aug 27, 2014 om 20:29 heeft Theuno notifications@github.com het volgende geschreven:

...as with _Backlight)

Minor improvement

You can merge this Pull Request by running

git pull https://github.com/Theuno/bw_library master
Or view, comment on, or merge it at:

#7

Commit Summary

Add _Contrast variable to BitWizardLcd, to be able to use the variable (as with _Backlight)
File Changes

M src/BitWizard/bw.py (4)
Patch Links:

https://github.com/rewolff/bw_library/pull/7.patch
https://github.com/rewolff/bw_library/pull/7.diff
—
Reply to this email directly or view it on GitHub.

[rewolff]

"pretend this never happened".... If you push your changes to github, those are safe and you won't have to do things again. With a bit of luck, github will still say: "this pull request can be automatically merged". If so, good. If not, you could do the merge yourself, or ask theuno or me to redo the patch for the latest version....

[Theuno]

This shouldn't overwrite anything, and the request can be automaticly merged.
To prevent the possible problem of losing items due to merges etc. it might be usefull to submit more often. Or in case the changes possibly less stable; submit changes to forks first?