Skip to content

Conversation

@mrmcwethy
Copy link
Collaborator

I think this should do it, but there seems to more changes than i expected. One of these days i will get the hang of GIT. The only real changes are to the .gitmodule file.

@mrmcwethy
Copy link
Collaborator Author

@tannewt can you take a look at this and let me know your comment. Adding Adafruit_CircuitPython_DHTlib to bundle

@tannewt tannewt self-requested a review September 19, 2017 18:31
@tannewt
Copy link
Member

tannewt commented Sep 19, 2017

The second commit looks good! The extra stuff looks like you need to run git submodule update. After selecting a new branch, the submodules are not updated and need to updated separately. Ping me on discord if you need help git wrangling.

@mrmcwethy
Copy link
Collaborator Author

@tannewt I did the rebase and git push --force. That cleaned it up.

@mrmcwethy
Copy link
Collaborator Author

@tannewt i renamed and tested the build-bundles.py and resultant .mpy file.

@tannewt tannewt merged commit 48f6191 into adafruit:master Sep 19, 2017
@tannewt
Copy link
Member

tannewt commented Sep 19, 2017

Thank you so much @mrmcwethy !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants