Conversation
…ranch The config version sync rewrites librechat.yaml snippets in every locale file on main, which conflicted with the translation branch's copies of the same lines and failed every Translate Docs run after #770 merged.
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
Codex Review SummaryThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
Contributor
📦 Next.js Bundle Analysis for librechat.aiThis analysis was generated by the Next.js Bundle Analysis action. 🤖 This PR introduced no changes to the JavaScript bundle! 🙌 |
This branch was successfully deployed
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
1 participant
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.
Summary
Translate Docs failed on every run after #770 merged: the config version sync rewrote the
version:line oflibrechat.yamlsnippets in the locale files onmain, and mergingmainintoautomation/docs-translationsconflicted with the branch's copies of the same lines (66 files, all version lines).I resolved the current conflict on the bot branch by hand (main wins conflicting hunks, translations kept elsewhere;
check:config-versionpasses). This PR makes the workflow do the same withmerge -X theirs, so the next config bump does not stop translations again.Change Type
Testing
actionlintcleanmerge -X theirsresolves all 66 conflicts with only version lines taken frommainChecklist