merge: resolve conflicts with main (PR #293)

Browse Source

Keep our fixes over the merged auto-repair PR:
- plugin_manager: backup dir skip + clear-before-update
- state_reconciliation: no skip on missing 'enabled', default True
- store_manager: resolved_id for monorepo migration
- app.py: reconciliation threading lock + return type

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

...

This commit is contained in:

ChuckBuilds

2026-03-26 11:20:29 -04:00

parent 2148973cf6 640a4c1706

commit e23287c027

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available