Conversation
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
There's a bug with UnresolvedFile with queued action updates that blips a broken state. disableWorkerPool works around this for now, and I have a proper fix coming in #504
![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: 872ced841a
ℹ️ About Codex in GitHub
Your team has set up Codex to 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 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| if (!this.hunksRenderer.canRenderDiffSynchronously(pending.fileDiff)) { | ||
| return; |
There was a problem hiding this comment.
When a controlled unresolved update is pending, this branch returns immediately if canRenderDiffSynchronously(...) is false, but it does not call prepareDiffRender(...) to enqueue work for the current render options. That can deadlock the pending state after worker option changes: WorkerPoolManager.setRenderOptions() clears diff cache and triggers rerender(), this method exits here, and no new highlight task is scheduled for the pending diff, so the merge-conflict UI can stay stuck on the old state indefinitely until some unrelated render(...) call happens.
Useful? React with 👍 / 👎.
amadeus
force-pushed
the
amadeus/conflict-action-fix
branch
from
872ced8 to
4371c12
Compare
1 participant
WIP