Fix conflicts in pnpm lock file during merges

[Copilot]

Plan: Automated pnpm Lock File Conflict Resolution

• Create .gitattributes file with custom merge driver for pnpm-lock.yaml
• Create a merge driver script to automatically resolve pnpm lock conflicts
• Add setup instructions in documentation
• Add pnpm version enforcement in package.json engines field
• Test the solution with a simulated merge conflict
• Run code review

Summary

Successfully implemented an automated solution for pnpm-lock.yaml merge conflicts using:

1. Union merge strategy (.gitattributes) - Automatically combines both versions during merges
2. Post-merge hook (setup-merge-driver.sh) - Auto-runs pnpm install after merges to regenerate valid lockfile
3. Version enforcement (package.json) - Ensures consistent pnpm version (>=10.0.0) across all developers
4. Comprehensive documentation - Setup guide, troubleshooting, and best practices in docs/pnpm-lock-conflict-resolution.md
5. Test documentation - Detailed test results in docs/pnpm-lock-test-results.md

How It Works

When developers merge branches with conflicting pnpm-lock.yaml changes:

1. Git automatically combines both versions using the union strategy (no manual conflict resolution needed)
2. The merge completes successfully
3. A post-merge hook automatically runs pnpm install --no-frozen-lockfile
4. pnpm regenerates a correct lockfile with dependencies from both branches
5. Developer reviews and commits the updated lockfile if needed

Testing

✅ All tests passed - Verified with comprehensive test that simulates realistic merge conflict scenario:

• Created two branches modifying different packages
• Both modified pnpm-lock.yaml creating a conflict
• Merge completed successfully without manual intervention
• Post-merge hook ran automatically
• Final lockfile was valid and consistent

The solution eliminates the need for manual pnpm-lock.yaml conflict resolution while ensuring lockfile integrity.

Original prompt

我在合并分支的时候总是会遇到 pnpm lock 文件的冲突，有有没有好的办法自动解决？

---

💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.

[hotlong]

@copilot 继续

[Copilot]

@copilot 继续

✅ 已完成所有任务！

测试结果 (Test Results):

• ✅ 成功模拟合并冲突场景
• ✅ union merge 策略自动合并了 pnpm-lock.yaml
• ✅ post-merge hook 自动运行 pnpm install
• ✅ 最终 lockfile 验证通过

解决方案 (Solution):

1. .gitattributes: 使用 union 合并策略
2. setup-merge-driver.sh: 安装 post-merge hook
3. 完整文档和测试结果已添加

详细测试报告请查看 docs/pnpm-lock-test-results.md

提交: 5bb7bd7