Skip to content
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

nodogsplash: remove opennds from conflicts #1001

Merged
merged 1 commit into from
Jul 29, 2023

Conversation

mwarning
Copy link
Contributor

@mwarning mwarning commented Jul 27, 2023

OpenNDS lists nodogsplash a conflict as well.
This causes a circular reference that is not allowed.

@mwarning
Copy link
Contributor Author

mwarning commented Jul 27, 2023

@hnyman @bluewavenet fyi

@mwarning
Copy link
Contributor Author

@hnyman do you know what this message "This branch cannot be rebased due to too many changes" is about and how I can start the pipeline?

OpenNDS lists nodogsplash a conflict as well.
This causes a circular reference that is not allowed.

Signed-off-by: Moritz Warning <moritzwarning@web.de>
@mwarning
Copy link
Contributor Author

@hnyman do you know how we can get this merged? I do not understand the message "This branch cannot be rebased due to too many changes". I've found a reference here: https://github.com/orgs/community/discussions/51612

@hnyman
Copy link
Contributor

hnyman commented Jul 28, 2023

Never heard of that problem earlier. Based on that linked discussion, seems like a recent widespread GitHub problem.

Suggested workarounds seemed to be temporarily switching the PR to based on some other barnch than master, or you might just drop the PR, and recreate a new one. (If it is a temporary GitHub glitch)

@mwarning mwarning merged commit 967dde5 into openwrt:master Jul 29, 2023
11 checks passed
@mwarning
Copy link
Contributor Author

mwarning commented Jul 29, 2023

The error has vanished without on its own and I have been able to merge. :-)

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