search

jeelabs / jeelib

JeeLib for Arduino IDE: Ports, RF12, and RF69 drivers from JeeLabs
https://jeelabs.org/202x/sw/jeelib/
The Unlicense
490 stars 215 forks source link

Rf12 demo #59

Closed JohnOH closed 10 years ago

jcw commented 11 years ago

I think you're fighting git more than necessary - your a028aee commit (see end of https://github.com/jcw/jeelib/pull/59) merely adds an empty line. The second does more, but there's no need for me to merge it, it's already in the right place.

Might be something to do with the clone you're working with. Try a fresh git pull from github/jcwjeelib and switch to the RF12Demo branch. It should all be there. Now that you have developer access, you can simply edit and then git push and the changes will end up on GitHub - no need for pull requests, since you have write (i.e. push) permission.

Just guessing...

jcw commented 10 years ago

Close this for now. The merge can't proceed automatically proceed, please set up a new pull request if this is still applicable.