Skip to content

Conversation

dongzhenye
Copy link
Contributor

描述

根据 #3560 的讨论,提交Fork更新的完整解决方案。

背景

NotionNext用户在更新时普遍遇到的问题:

  • GitHub的Sync fork会覆盖个性化配置
  • 手动合并容易出错或遗漏
  • 缺少版本追踪机制

本PR内容

1. 更新指南文档 (docs/UPDATE.md)

  • 双分支管理策略说明
  • 详细的操作步骤
  • 冲突处理指导
  • 故障排查方案
  • Vercel配置说明

2. 自动化脚本 (scripts/update.sh)

  • 自动备份个性化文件
  • 智能冲突处理(按文件类型)
  • 版本号追踪(在merge commit中)
  • 构建验证
  • 错误恢复机制

测试

  • macOS + zsh 环境测试通过
  • 生产环境使用数月,运行稳定
  • 版本号追踪功能正常
  • 备份恢复机制有效

示例

脚本执行后的merge commit包含版本信息:

merge: 同步上游更新 (v4.8.6-34-gf3babf96 → v4.8.6-61-ga668dc82)

Checklist

感谢考虑这个贡献!欢迎任何反馈和建议。

- Add dual-branch management strategy documentation
- Include conflict resolution guidelines
- Provide Vercel deployment configuration steps
- Add troubleshooting section for common issues
- Reference official NotionNext documentation

Refs tangly1024#3560
- Auto backup personal configurations before update
- Smart conflict resolution by file type
- Version tracking in merge commits
- Build verification support
- Error handling and recovery mechanisms

Script tested on macOS/Linux with bash/zsh

Refs tangly1024#3560
Copy link

vercel bot commented Aug 19, 2025

@dongzhenye is attempting to deploy a commit to the tangly1024's projects Team on Vercel.

A member of the Team first needs to authorize it.

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