Skip to content

Conversation

@njh
Copy link
Contributor

@njh njh commented Jan 12, 2017

No description provided.

@njh
Copy link
Contributor Author

njh commented Mar 7, 2017

Hi,

Is anything else needed in order to accept this Pull Request?

nick.

@njh
Copy link
Contributor Author

njh commented Jan 1, 2018

Ping? This very simple pull request was opened nearly a year ago...

@caternuson
Copy link
Contributor

The address seems to redirect OK?

@caternuson caternuson closed this Sep 24, 2021
@njh
Copy link
Contributor Author

njh commented Sep 27, 2021

@caternuson redirects in web browser - just looking up Repo using the API can be problematic.

I am not sure why you didn't just merge the fix?
Was there an issue with the PR?

@caternuson
Copy link
Contributor

We're just super careful about changing anything in library.properties to avoid breaking things with any Arduino Library Manager plumbing, etc. Changes made after registering the library repo can sometimes have unexpected effects. For example, name can't be changed on the fly.

We'll merge this and see what happens. If things break, we can revert.

@caternuson caternuson reopened this Sep 28, 2021
@caternuson
Copy link
Contributor

You'll need to push a new commit that includes current library.properties changes to resolve the merge conflict.

<<<<<<< patch-1
url=https://github.com/adafruit/Adafruit_LED_Backpack
=======
url=https://github.com/adafruit/Adafruit-LED-Backpack-Library
depends=Adafruit GFX Library, WaveHC, RTClib, Adafruit GPS Library
>>>>>>> master

@njh
Copy link
Contributor Author

njh commented Sep 28, 2021

I have rebased my branch, so the merge conflict should be fixed now.

@caternuson
Copy link
Contributor

yep. looks good. thanks for the fix.

@caternuson caternuson merged commit 91e2100 into adafruit:master Sep 28, 2021
@njh njh deleted the patch-1 branch September 29, 2021 09:07
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