🔄 Sync Failed: Merge Conflicts with Upstream

[github-actions]

Automatic sync failed

The daily sync with upstream (jackyzha0/quartz) failed due to merge conflicts.

Details

• Date: 2026-07-23T02:10:12.734Z
• Branch: v5
• Upstream Branch: jackyzha0/quartz:v5

Files with conflicts

quartz.lock.json

How to resolve

1. Pull the latest changes locally:

   git fetch upstream
   git checkout v5
   git merge upstream/v5
   # Resolve conflicts manually (watch quartz.config.yaml, theme/, plugins/, custom.scss)
   git add .
   git commit -m "Merge upstream v5: resolved conflicts"
   git push origin v5

2. Or manually sync via GitHub's "Sync fork" button and resolve conflicts there.

Next Steps

• Resolve merge conflicts
• Push resolved changes
• Close this issue once sync is complete

---

This issue was automatically created by the sync workflow.