Skip to content

feat: improve git upgrade handlers - #130

Merged
saberzero1 merged 1 commit into
mainfrom
wasm-git
Jun 8, 2026
Merged

feat: improve git upgrade handlers#130
saberzero1 merged 1 commit into
mainfrom
wasm-git

Conversation

@saberzero1

Copy link
Copy Markdown
Owner
  • 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/, and quartz/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.yaml is automatically accepted from upstream without blocking the upgrade.
  • 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 upgrade is now only recommended as a fallback when the in-app upgrade fails.

@saberzero1
saberzero1 marked this pull request as ready for review June 8, 2026 13:29
@saberzero1
saberzero1 merged commit a8948ac into main Jun 8, 2026
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant