🔄 Sync stable → main (conflicts)#3332
Conversation
superdoc-bot
Bot
added
patch-sync
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 1607257a9a
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
| if git merge --no-ff --no-edit "origin/${SOURCE_BRANCH}"; then | ||
| MERGE_STATUS="clean" | ||
| else | ||
| <<<<<<< HEAD |
There was a problem hiding this comment.
The workflow commit leaves Git conflict markers in the shell block, so when promote-stable.yml runs it will execute lines like <<<<<<< HEAD/=======/>>>>>>> origin/stable as shell input and fail before setting MERGE_STATUS. This breaks the stable→main promotion automation for every run of this workflow until the conflict is resolved.
Useful? React with 👍 / 👎.
| <<<<<<< HEAD | ||
| ({ commands, state }) => { | ||
| ======= | ||
| ({ commands, state, tr, dispatch }) => { | ||
| >>>>>>> origin/stable |
There was a problem hiding this comment.
This file contains unresolved merge markers inside setTextAlign, which makes the JavaScript invalid and prevents the editor package from parsing/building. Any runtime or test path that imports this extension will fail immediately with a syntax error until the conflict markers are removed and one implementation is selected.
Useful? React with 👍 / 👎.
| <<<<<<< HEAD | ||
| } | ||
| }; |
There was a problem hiding this comment.
Unresolved conflict markers were committed into comments-store.js, which makes the module syntactically invalid and breaks loading/building the SuperDoc package paths that import this store. This is a hard failure, not a behavior edge case, and must be resolved for the package to run.
Useful? React with 👍 / 👎.
| <<<<<<< HEAD | ||
| type ContentControlsHandle, | ||
| type ContentControlsSlice, | ||
| ======= | ||
| >>>>>>> origin/stable |
There was a problem hiding this comment.
The public ui.d.ts barrel includes raw merge markers around exported types, which makes the declaration file invalid TypeScript syntax. Consumers importing superdoc/ui types (and local type-checking for this package) will fail until this conflict is resolved.
Useful? React with 👍 / 👎.
Summary
Merges latest stable patches into main. Has merge conflicts that need manual resolution.
Release artifact conflicts were auto-resolved, but other conflicts remain.
Auto-created by sync-patches workflow.