nodogsplash: remove opennds from conflicts #1001
Conversation
|
@hnyman @bluewavenet fyi |
|
@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>
|
@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 |
|
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) |
|
The error has vanished without on its own and I have been able to merge. :-) |
OpenNDS lists nodogsplash a conflict as well.
This causes a circular reference that is not allowed.