-
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Allow other extended addresses than just 0xc8 to be routed from TX <-> RX (3.x.x maintenance) #2975
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: 3.x.x-maintenance
Are you sure you want to change the base?
Allow other extended addresses than just 0xc8 to be routed from TX <-> RX (3.x.x maintenance) #2975
Conversation
2a8a6f4
to
f60fd0b
Compare
It looks like you've targeted the 3.x.x branch but you code is on top of master. This cannot be merged to 3.x.x as it stands. |
Yes, I Made a mistake and accidentially rebased on master instead of 3.x.x-maintenance. Now I have a hard time to figure Out how to revert. Maybe you can Help? |
Just rebase on master again. Prior to doing so make sure master is up-to-date |
Did you see, that this PR originates from 3.x.x-maintenance? |
replace master with 3.x.x-maintenance in my comment |
Mmh ... I was looking for a way to reset HEAD to the last correct commit. Examining the reflog should make that possible, I think. |
f60fd0b
to
abd7c8c
Compare
abd7c8c
to
d05d3fc
Compare
d05d3fc
to
b5a9c91
Compare
b5a9c91
to
e67a26f
Compare
e67a26f
to
f4179ea
Compare
f4179ea
to
70ace65
Compare
029eee8
to
8bdcd60
Compare
This PR tries to solve #2901