Add auto merge with lockfile fix setup #84
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: huangyiirene <[email protected]>
Copilot stopped work on behalf of
huangyiirene due to an error
January 15, 2026 12:38
Contributor
|
@copilot 继续 |
hotlong
approved these changes
Jan 15, 2026
|
✅ All checks passed!
|
Co-authored-by: hotlong <[email protected]>
Contributor
Author
已完成所有实现！✅ 已添加 pnpm-lock.yaml 自动合并配置到以下工作流：
已完成文档更新：
配置验证：
提交: 6cb562d |
Co-authored-by: hotlong <[email protected]>
Co-authored-by: hotlong <[email protected]>
|
✅ All checks passed!
|
Copilot
AI
changed the title
[WIP] Add auto merge with lockfile fix setup
Add auto merge with lockfile fix setup
Jan 15, 2026
hotlong
approved these changes
Jan 15, 2026
hotlong
approved these changes
Jan 15, 2026
|
✅ All checks passed!
|
Contributor
There was a problem hiding this comment.
Pull request overview
This PR implements an automated Git merge driver configuration to handle pnpm-lock.yaml conflicts in CI workflows, eliminating manual conflict resolution during automated operations.
Changes:
- Added custom merge driver configuration to three workflows that may encounter lockfile conflicts
- Updated pnpm version from 9 to 10 across workflows for consistency
- Documented the merge driver setup and usage in the workflows documentation
Reviewed changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
.github/workflows/dependabot-auto-merge.yml |
Added checkout, pnpm/Node.js setup, and merge driver configuration for automated dependency updates |
.github/workflows/changeset-release.yml |
Added merge driver configuration and updated pnpm to v10 for release operations |
.github/workflows/changeset-check.yml |
Updated pnpm version to v10 for consistency |
.github/workflows/changelog.yml |
Added merge driver configuration for automated changelog updates |
.github/WORKFLOWS.md |
Added comprehensive documentation section explaining the merge driver setup, usage, and benefits |
Comment on lines
+21
to
+27
| - name: Configure Git merge driver for pnpm-lock.yaml | ||
| run: | | ||
| # Configure custom merge driver for pnpm-lock.yaml | ||
| # This allows Git to automatically resolve lockfile conflicts by regenerating it | ||
| git config merge.pnpm-merge.name "pnpm-lock.yaml merge driver" | ||
| git config merge.pnpm-merge.driver "pnpm install --no-frozen-lockfile" | ||
There was a problem hiding this comment.
The merge driver is configured but pnpm is not installed in this workflow. The driver command 'pnpm install --no-frozen-lockfile' will fail if triggered because there are no pnpm setup steps. Either add pnpm/Node.js setup steps before this configuration, or remove this configuration if merge operations are not expected in this workflow.
Suggested change
| - name: Configure Git merge driver for pnpm-lock.yaml | |
| run: | | |
| # Configure custom merge driver for pnpm-lock.yaml | |
| # This allows Git to automatically resolve lockfile conflicts by regenerating it | |
| git config merge.pnpm-merge.name "pnpm-lock.yaml merge driver" | |
| git config merge.pnpm-merge.driver "pnpm install --no-frozen-lockfile" |
| This configuration is active in the following workflows: | ||
| - **Changeset Release** (`changeset-release.yml`): Handles lockfile updates during version bumping | ||
| - **Auto Changelog** (`changelog.yml`): Prevents conflicts during automated changelog updates |
There was a problem hiding this comment.
The documentation should also mention the Dependabot Auto-merge workflow (dependabot-auto-merge.yml) since it now has the merge driver configuration as well.
Suggested change
| - **Auto Changelog** (`changelog.yml`): Prevents conflicts during automated changelog updates | |
| - **Auto Changelog** (`changelog.yml`): Prevents conflicts during automated changelog updates | |
| - **Dependabot Auto-merge** (`dependabot-auto-merge.yml`): Automatically resolves pnpm lockfile conflicts during Dependabot PR merges |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Implementation: Ultimate Automation for pnpm-lock.yaml Merge Conflicts
This PR implements an automated solution to handle pnpm-lock.yaml merge conflicts in CI workflows by configuring a custom Git merge driver.
Changes Made
Modified Workflows:
.github/workflows/changeset-release.yml- Added merge driver config for version bumping operations and updated pnpm to v10.github/workflows/changelog.yml- Added merge driver config for automated changelog updates.github/workflows/dependabot-auto-merge.yml- Added checkout step, pnpm/Node.js setup (v10), and merge driver config.github/workflows/changeset-check.yml- Updated pnpm to v10 for consistency across workflowsDocumentation:
5.
.github/WORKFLOWS.md- Added comprehensive "Automatic Lockfile Merge Resolution" sectionHow It Works
The solution combines repository-level configuration (
.gitattributesalready haspnpm-lock.yaml merge=pnpm-merge) with CI-level git config commands that define what the merge driver does:When a merge conflict occurs in
pnpm-lock.yaml, Git automatically runspnpm install --no-frozen-lockfileto regenerate the lockfile instead of requiring manual conflict resolution.Benefits
Testing
Original prompt
💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.