added driver for TSL2561

[caternuson]

what it says

[ladyada]

do you mind if we make some tweaks to the TSL2561 library to make it more memory-efficient? :)

[caternuson]

not at all, but would like to know the where and how

[ladyada]

ok ill open up issues /there/ with suggestions!

[tannewt]

Please rebase this. Other modules have been updated/added since this pull was requested.

[caternuson]

OK. Trying to rebase. What am I doing wrong? Here's what I did:

make local copy of my branch:

git clone https://github.com/caternuson/Adafruit_CircuitPython_Bundle.git

add upstream remote:

cd Adafruit_CircuitPython_Bundle
git remote add upstream https://github.com/adafruit/Adafruit_CircuitPython_Bundle.git

fetch upstream:

git fetch upstream

try to rebase:

git rebase upstream/master

FAIL due to conflict in .gitmodule
fix with text editor - added content from both branches
commit changes:

git add .
git commit -m "resolved rebase conflict"

try to continue with rebase:

git rebase --continue

acts like there's nothing to do:

Applying: added driver for TSL2561
No changes - did you forget to use 'git add'?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch.

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".

[tannewt]

git rebase --continue does the commit on your behalf so don't do it yourself.

[caternuson]

That's what I did initially, but got this which made me think I needed to add/commit:

.gitmodules: needs merge
You must edit all merge conflicts and then
mark them as resolved using git add

[tannewt]

You just need to add and then continue. No commit

[caternuson]

Ohhhh. Add but don't commit. Got it. That worked. (that's wasn't obvious, and so programmed to commit after an add)

Secret sauce for future ref:

git clone https://github.com/caternuson/Adafruit_CircuitPython_Bundle.git
cd Adafruit_CircuitPython_Bundle
git remote add upstream https://github.com/adafruit/Adafruit_CircuitPython_Bundle.git
git fetch upstream
git rebase upstream/master

fix conflicts

git add .
git rebase --continue

[caternuson]

OK. Now having issues pushing up changes:

git push origin master

To https://github.com/caternuson/Adafruit_CircuitPython_Bundle.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'https://github.com/caternuson/Adafruit_CircuitPython_Bundle.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

[tannewt]

Use the --force or --force-with-lease to be nice.

[caternuson]

Well, that worked. Why was that necessary?

Also - do I make a new PR from this rebased fork?

[tannewt]

Force is necessary when you rebase because you aren't simply adding another commit. You are actually replacing some commits with others.

No need for a new PR. PRs are based on the branch which you just updated. :-)

[tannewt]

Looks good! Thank you!