-
Notifications
You must be signed in to change notification settings - Fork 2
Closed
Description
Manual cherrypick required.
#76 failed to apply on top of branch "stable/2025.2":
Applying: fix: remove uv cache mounts
Using index info to reconstruct a base tree...
M Dockerfile
Falling back to patching base and 3-way merge...
Auto-merging Dockerfile
CONFLICT (content): Merge conflict in Dockerfile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 fix: remove uv cache mounts
Reactions are currently unavailable
Metadata
Metadata
Assignees
Labels
No labels