🔄 Sync stable → main (conflicts)#3345
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: f3ff922200
ℹ️ 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".
| */ | ||
| setTextAlign: | ||
| (alignment) => | ||
| <<<<<<< HEAD |
There was a problem hiding this comment.
The file still contains Git conflict markers, so packages/super-editor cannot be parsed or built. Any runtime path or test that imports this extension will fail immediately with a syntax error before setTextAlign can execute, which blocks the mixed LTR/RTL alignment fix entirely.
Useful? React with 👍 / 👎.
| if git merge --no-ff --no-edit "origin/${SOURCE_BRANCH}"; then | ||
| MERGE_STATUS="clean" | ||
| else | ||
| <<<<<<< HEAD |
There was a problem hiding this comment.
This workflow file includes unresolved merge markers, which makes the YAML invalid for GitHub Actions parsing. In that state, promote-stable.yml will not load when triggered, so stable promotion automation is broken until the conflict is resolved.
Useful? React with 👍 / 👎.
1 participant
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.