Skip to content

Reuse "Not connected" message in bleio#1703

Merged
dhalbert merged 1 commit into
adafruit:masterfrom
pypewpew:typo3
Mar 25, 2019
Merged

Reuse "Not connected" message in bleio#1703
dhalbert merged 1 commit into
adafruit:masterfrom
pypewpew:typo3

Conversation

@deshipu
Copy link
Copy Markdown

@deshipu deshipu commented Mar 25, 2019

No description provided.

@deshipu
Copy link
Copy Markdown
Author

deshipu commented Mar 25, 2019

I need to wait for the other pull request to merge, so that I can run make translate — to avoid conflicts.

@deshipu deshipu changed the title Typo3 Reuse "Not connected" message in bleio Mar 25, 2019
@dhalbert
Copy link
Copy Markdown
Collaborator

Could you merge from upstream? I think your PR may be reverting the updates to the frozen libraries.

@deshipu
Copy link
Copy Markdown
Author

deshipu commented Mar 25, 2019

I tried this:

sheep@ghostwheel:~/dev/circuitpython/circuitpython$ git checkout master
Already on 'master'
Your branch is up to date with 'origin/master'.
sheep@ghostwheel:~/dev/circuitpython/circuitpython$ git pull git@github.com:adafruit/circuitpython.git
From github.com:adafruit/circuitpython
 * branch                HEAD       -> FETCH_HEAD
Already up to date.
sheep@ghostwheel:~/dev/circuitpython/circuitpython$ git checkout typo3
M	frozen/Adafruit_CircuitPython_BusDevice
M	frozen/Adafruit_CircuitPython_HID
M	frozen/Adafruit_CircuitPython_Motor
M	frozen/Adafruit_CircuitPython_NeoPixel
M	frozen/Adafruit_CircuitPython_seesaw
Switched to branch 'typo3'
Your branch is up to date with 'origin/typo3'.
sheep@ghostwheel:~/dev/circuitpython/circuitpython$ git rebase master
Current branch typo3 is up to date.
sheep@ghostwheel:~/dev/circuitpython/circuitpython$ git push --force
Everything up-to-date

@deshipu
Copy link
Copy Markdown
Author

deshipu commented Mar 25, 2019

I think I got it now. The submodule stuff seems to be somehow tracked outside of the normal repository and is ignored by rebase.

@dhalbert dhalbert merged commit 952c9c5 into adafruit:master Mar 25, 2019
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