[GS-3221] Resolve merge conflicts for openclaw PR#8
Open
tediferJones wants to merge 2697 commits intofeat/guardrail_interfacefrom
Open
[GS-3221] Resolve merge conflicts for openclaw PR#8tediferJones wants to merge 2697 commits intofeat/guardrail_interfacefrom
tediferJones wants to merge 2697 commits intofeat/guardrail_interfacefrom
Conversation
* changelog: add security deepMerge prototype-pollution fix entry * update: refresh gateway service env during update restart * test(cli): fix daemon install mock assertion * test(cli): guard update restart false path
tediferJones
force-pushed
the
jj+theo/conflict_resolve+e2e
branch
from
7359631 to
8f25f0a
Compare
tediferJones
force-pushed
the
jj+theo/conflict_resolve+e2e
branch
from
1ecfcbc to
8ec77f5
Compare
Author
|
Seems to be a loop here. Running "pnpm protocol:gen && pnpm protocol:gen:swift" breaks swift formatting, and running "swiftformat" breaks "pnpm:check" (which runs "pnpm protocol:check") |
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
19 participants
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.
Fixed CI issues (hopefully) and merged openclaw:main