merge: resolve changelog conflicts with main
Keep both Unreleased bullets: the config-wipe Settings fix and the stale merged-PR Git panel fix from main. Co-authored-by: serkraser <serkraser@gmail.com>
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
## [Unreleased]
|
||||
|
||||
- **Settings:** OpenChamber no longer replaces a full OpenCode config with an empty `$schema`-only stub when the file uses JSON5-style unquoted keys; Settings changes now fail instead of wiping plugins, MCP servers, and providers (thanks to @makeittech).
|
||||
- Git: the pull request panel now follows the current open PR for the branch instead of keeping a merged or closed one after reload or a later open PR (thanks to @makeittech).
|
||||
|
||||
## [1.18.4] - 2026-08-14
|
||||
|
||||
|
||||
Reference in New Issue
Block a user