search

openwrt / routing

OpenWrt Routing Packages
330 stars 369 forks source link

nodogsplash: remove opennds from conflicts #1001

Closed mwarning closed 1 year ago

mwarning commented 1 year ago

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

mwarning commented 1 year ago

@hnyman @bluewavenet fyi

mwarning commented 1 year ago

@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?

mwarning commented 1 year ago

@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 commented 1 year ago

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 commented 1 year ago

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