Skip to content

[WIP] Configure pnpm-lock.yaml merge driver#102

Merged
huangyiirene merged 2 commits intomainfrom
copilot/configure-pnpm-merge-driver
Jan 15, 2026
Merged

[WIP] Configure pnpm-lock.yaml merge driver#102
huangyiirene merged 2 commits intomainfrom
copilot/configure-pnpm-merge-driver

Conversation

Copy link
Copy Markdown
Contributor

Copilot AI commented Jan 15, 2026

Configure pnpm-lock.yaml Merge Driver

This PR sets up a custom Git merge driver for pnpm-lock.yaml to automatically resolve merge conflicts by running pnpm install.

Completed:

  • Create .gitattributes file to specify merge driver for pnpm-lock.yaml
  • Create a setup script (scripts/setup-merge-driver.sh) to configure the merge driver
  • Update documentation in docs/guide/ide-setup.md with setup instructions
  • Test the configuration to ensure it works as expected

Technical Implementation:

  • The .gitattributes file tells Git to use the "pnpm-merge" driver for pnpm-lock.yaml
  • The setup script configures:
    • merge.pnpm-merge.name = "pnpm-lock.yaml merge driver"
    • merge.pnpm-merge.driver = "pnpm install"
  • When merge conflicts occur in pnpm-lock.yaml, Git will automatically run pnpm install to regenerate the lock file
  • Documentation provides both automated (via script) and manual setup instructions
Original prompt

pnpm-lock.yaml merge=pnpm-merge
git config merge.pnpm-merge.name "pnpm-lock.yaml merge driver"
git config merge.pnpm-merge.driver "pnpm install"


✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.

Co-authored-by: huangyiirene <7665279+huangyiirene@users.noreply.github.com>
@huangyiirene huangyiirene marked this pull request as ready for review January 15, 2026 11:57
@huangyiirene huangyiirene merged commit 187d406 into main Jan 15, 2026
@huangyiirene huangyiirene deleted the copilot/configure-pnpm-merge-driver branch January 15, 2026 11:57
Copilot AI requested a review from huangyiirene January 15, 2026 11:57
Copilot stopped work on behalf of huangyiirene due to an error January 15, 2026 11:57
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.

2 participants