- Significantly improved Quartz upgrade reliability with smart conflict resolution.
- Upgrades now automatically succeed when the user has only modified dedicated user files (
quartz.config.yaml,quartz.lock.json,quartz.ts,quartz/styles/custom.scss,content/,.github/,quartz/static/, andquartz/styles/syncer/). - Framework files (everything else) automatically accept upstream changes during upgrade.
- User-owned files are preserved across upgrades via snapshot and restore, even if upstream cleanly modified them.
- If the user has modified framework files, the upgrade fails with a specific list of which files were modified, instead of a generic merge conflict error.
quartz.config.default.yamlis automatically accepted from upstream without blocking the upgrade.
- Upgrades now automatically succeed when the user has only modified dedicated user files (
- Removed unnecessary post-merge commits when user files were not changed by upstream.
- Updated upgrade notification to reference the in-app Upgrade button instead of
npx quartz upgrade.npx quartz upgradeis now only recommended as a fallback when the in-app upgrade fails.
What's Changed
- feat: improve git upgrade handlers by @saberzero1 in #130
Full Changelog: 1.17.3...1.18.0