Repository navigation
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Updates
fix/nsjail-no-cgroup-cloneto the resolved upstreamLibreChat-AI/code-interpretermain snapshot atc854ab5f37c656e88e6e4ad8b834cc8d17659151(75 upstream commits beyond the previous sync).Conflict resolutions preserve both sides:
clone_newcgroupwhen cgroups are disabled.service/src/minio-client.tsmodule.The 9 fork-specific commits were replayed on upstream main for the merge result. This sync branch applies that resolved tree as a snapshot commit on top of the fork branch. The earlier code sync PR #4 was already merged, so there is no open older sync PR to close.
CI note: the first
Deployment Config Testsrun failed withPermission deniedontests/kvm_guest_dns.sh. The GitHub file write created that shell script without its executable mode, so the latest commit updates the workflow to run it throughbash. The updated head was pushed; follow-up checks are not yet visible.Verification: current upstream/fork tips and the merge result were checked locally; no conflict markers remain. Tests were not run locally.