[WIP] Configure pnpm-lock.yaml merge driver#102
Merged
huangyiirene merged 2 commits intomainfrom Jan 15, 2026
Merged
Conversation
Co-authored-by: huangyiirene <7665279+huangyiirene@users.noreply.github.com>
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
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.
Configure pnpm-lock.yaml Merge Driver
This PR sets up a custom Git merge driver for
pnpm-lock.yamlto automatically resolve merge conflicts by runningpnpm install.Completed:
.gitattributesfile to specify merge driver forpnpm-lock.yamlscripts/setup-merge-driver.sh) to configure the merge driverdocs/guide/ide-setup.mdwith setup instructionsTechnical Implementation:
.gitattributesfile tells Git to use the "pnpm-merge" driver forpnpm-lock.yamlmerge.pnpm-merge.name= "pnpm-lock.yaml merge driver"merge.pnpm-merge.driver= "pnpm install"pnpm-lock.yaml, Git will automatically runpnpm installto regenerate the lock fileOriginal prompt
✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.