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

Fix URLs and checks #1194

Merged
merged 5 commits into from
Mar 11, 2025
Merged

Conversation

Ki-er
Copy link
Collaborator

@Ki-er Ki-er commented Mar 10, 2025

As part of #1
Fixed Flexisip url as was showing 404 again
Fixed zentao dead url
Added links to url check that are present from 1 month ago

https://github.com/awesome-selfhosted/awesome-selfhosted-data/actions/runs/13753167155

https://github.com/awesome-selfhosted/awesome-selfhosted-data/actions/runs/13318373076

@Ki-er Ki-er added the curation Removal of abandoned projects, dead links label Mar 10, 2025
@Rabenherz112
Copy link
Collaborator

raw
Never actually done that before in GitHub, therefore the probably stupid question, is that a me error, or..?

@nodiscc
Copy link
Member

nodiscc commented Mar 11, 2025

Strange, I don't see the same thing
Do you still have this problem?
image

@Rabenherz112
Copy link
Collaborator

Rabenherz112 commented Mar 11, 2025

I do however only when I want to do a rebase merge? With the Squash and merge function, it seems fine?
raw

Edit:
Same issue also for example with #1195. The squash and merge button is green but as soon as I want to do a rebase merge it says that it is failing due to requirements?

@nodiscc
Copy link
Member

nodiscc commented Mar 11, 2025

Yeah, rebase merge won't work in this case, it says just above This branch cannot be rebased due to conflicts
Squash and merge is the correct thing to do anyway
Looks good to me

@Rabenherz112
Copy link
Collaborator

Ah, I though since you said please always use rebase merge, let's try to avoid merge commits, that rebase and merge was the wanted merge method. Sry

@Rabenherz112 Rabenherz112 merged commit d1b3a88 into awesome-selfhosted:master Mar 11, 2025
1 check passed
@nodiscc
Copy link
Member

nodiscc commented Mar 11, 2025

Squash and merge is what I meant, sorry for the confusion. I just disabled other merge methods in settings
image

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
curation Removal of abandoned projects, dead links
Development

Successfully merging this pull request may close these issues.

3 participants