Skip to content

Handle stale merge conflicts and add window opacity settings#261

Merged
BunsDev merged 1 commit into
mainfrom
okcode/graceful-error-handling
Apr 5, 2026
Merged

Handle stale merge conflicts and add window opacity settings#261
BunsDev merged 1 commit into
mainfrom
okcode/graceful-error-handling

Conversation

@BunsDev

@BunsDev BunsDev commented Apr 5, 2026

Copy link
Copy Markdown
Member

Summary

  • Added graceful handling for stale or unavailable merge-conflict candidates, with clearer messaging and a manual-resolution fallback.
  • Moved background image persistence/DOM application into shared theme utilities and added a new app-wide window opacity setting for desktop.
  • Simplified chat layout by removing the in-app background layer and added a wider thread-name setting in sidebar preferences.
  • Updated desktop IPC to support runtime window opacity changes and added localized copy for the new settings.

Testing

  • Not run (per request).
  • Added/updated unit coverage for stale merge-conflict error humanization.
  • Existing settings schema coverage was adjusted to match the new persisted settings shape.

@BunsDev
Handle stale merge-conflict errors gracefully
325d711 
- Add recoverable error toasts for stale conflict candidates and refresh failures
- Keep users in the prepared workspace with clearer manual-resolution guidance
- Update conflict shell tests and copy for the no-safe-patch fallback
@vercel

vercel Bot commented Apr 5, 2026 •
edited
Loading

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
okcode-marketing Ready Ready Preview Apr 5, 2026 6:57am
v0-compute-the-platform-to-build Ready Ready Preview, Open in v0 Apr 5, 2026 6:57am

@github-actions github-actions Bot added size:L vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. labels Apr 5, 2026
@BunsDev BunsDev merged commit d241602 into main Apr 5, 2026
10 of 11 checks passed
@BunsDev BunsDev deleted the okcode/graceful-error-handling branch April 6, 2026 17:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

size:L vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@BunsDev