search

EnviroDIY / Arduino-SDI-12

An Arduino library for SDI-12 communication with a wide variety of environmental sensors. This library provides a general software solution, without requiring any additional hardware.
https://github.com/EnviroDIY/Arduino-SDI-12/wiki
BSD 3-Clause "New" or "Revised" License
159 stars 100 forks source link

First push of code. #1

Closed Kevin-M-Smith closed 10 years ago

Kevin-M-Smith commented 10 years ago

I have updated SDI12.cpp and SDI12.h to the latest versions. Added keywords.txt and two simple examples.

Kevin-M-Smith commented 10 years ago

I've added keywords.txt and two examples.

Kevin-M-Smith commented 10 years ago

Excellent!

On Nov 20, 2013, at 9:33 PM, Anthony Aufdenkampe notifications@github.com<mailto:notifications@github.com> wrote:

Merged #1https://github.com/StroudCenter/Arduino-SDI-12/pull/1.

— Reply to this email directly or view it on GitHubhttps://github.com/StroudCenter/Arduino-SDI-12/pull/1.

aufdenkampe commented 10 years ago

Kevin, I figured out that the issue was that you had modified the LICENSE file in both my MASTER and your FORK. After messing with the command line a bit to no avail, I finally just deleted the LICENSE file on my MASTER and made a new one that was identical to yours. This then allowed me to merge via the GitHub website. So in the end I never needed the command line!

Kevin-M-Smith commented 10 years ago

Ah! Good to know. Learning Git and figuring GitHub will have its growing pains, but I'm convinced it will be worth it. Especially with what you mentioned about moving beyond software.

On Nov 20, 2013, at 9:49 PM, Anthony Aufdenkampe notifications@github.com<mailto:notifications@github.com> wrote:

Kevin, I figured out that the issue was that you had modified the LICENSE file in both my MASTER and your FORK. After messing with the command line a bit to no avail, I finally just deleted the LICENSE file on my MASTER and made a new one that was identical to yours. This then allowed me to merge via the GitHub website. So in the end I never needed the command line!

— Reply to this email directly or view it on GitHubhttps://github.com/StroudCenter/Arduino-SDI-12/pull/1#issuecomment-28953872.