Skip to content

fix: correctly merge conflicting paths when files (instead of dirs) are being linked #3458

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.

Sign up for GitHub

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

Merged
rickeylev merged 4 commits into from
Dec 14, 2025
Merged

fix: correctly merge conflicting paths when files (instead of dirs) are being linked #3458

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8a752a0
fix dupe file conflict merging
rickeylev Dec 13, 2025
8c705b8
revert docs requirements changes
rickeylev Dec 13, 2025
d00109d
fix typo
rickeylev Dec 14, 2025
da6ba5e
Merge branch 'main' into fix.conflict.merging.files
rickeylev Dec 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions docs/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,9 @@ sphinx_build_binary(
requirement("typing_extensions"),
requirement("sphinx_autodoc2"),
requirement("sphinx_reredirects"),
requirement("nvidia-cublas-cu12"),
requirement("nvidia-cuda-cupti-cu12"),
requirement("torch"),
"//sphinxdocs/src/sphinx_bzl",
],
)
Expand Down
Loading