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

Merge branch 'main' into fix.conflict.merging.files

da6ba5e
Select commit
Loading
Failed to load commit list.
Sign in for the full log view
Merged

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

Merge branch 'main' into fix.conflict.merging.files
da6ba5e
Select commit
Loading
Failed to load commit list.

The logs for this run have expired and are no longer available.