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

[stable/zed] Switch docs to Sphinx #1168

Closed
vexxhost-bot opened this issue Apr 29, 2024 · 0 comments · Fixed by #1169
Closed

[stable/zed] Switch docs to Sphinx #1168

vexxhost-bot opened this issue Apr 29, 2024 · 0 comments · Fixed by #1169
Assignees

Comments

@vexxhost-bot
Copy link
Collaborator

Manual cherrypick required.

#1166 failed to apply on top of branch "stable/zed":

Applying: Switch docs to Sphinx
error: patch failed: docs/kubernetes/certificates.md:1
error: docs/kubernetes/certificates.md: patch does not apply
error: Did you hand edit your patch?
It does not apply to blobs recorded in its index.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Using index info to reconstruct a base tree...
M	galaxy.yml
M	poetry.lock
M	pyproject.toml
Patch failed at 0001 Switch docs to Sphinx
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

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 a pull request may close this issue.

2 participants