Closed brycedjohnson closed 6 years ago
Was having a heck of a time with merge conflicts, so I did a Squash and merge within github and that seemed to do it.
Wanted to separate the rebased CLI and ADC into two commits, but I didn't keep my feature branches as clean as I would have liked.
This has: @blckmn ADC changes with a couple fixes Rebased CLI with some test commands to get the ADC reading and change led colors
The CLI might be heavy for what we need, so I image it will could get disabled at some point, but it is good for testing now.
Not sure why it says the whole file changed on a couple of them. Maybe line endings?
Was having a heck of a time with merge conflicts, so I did a Squash and merge within github and that seemed to do it.
Wanted to separate the rebased CLI and ADC into two commits, but I didn't keep my feature branches as clean as I would have liked.
This has: @blckmn ADC changes with a couple fixes Rebased CLI with some test commands to get the ADC reading and change led colors
The CLI might be heavy for what we need, so I image it will could get disabled at some point, but it is good for testing now.
Not sure why it says the whole file changed on a couple of them. Maybe line endings?