feat: treat uv.lock as binary and configure merge driver #444
+10
−0
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
This marks uv.lock as a binary file to suppress diffs and configures a custom merge driver 'uv-lock' to automatically regenerate the lockfile on conflicts. Instructions for configuring the local git merge driver have been added to README.md.
There was a problem hiding this comment.
Pull request overview
This PR configures Git to handle uv.lock files more efficiently by treating them as binary files to suppress large diffs in pull requests, while providing a custom merge driver that automatically regenerates the lockfile when merge conflicts occur.
- Adds
.gitattributesfile to markuv.lockas binary with custom merge driver - Documents the one-time local git configuration setup for developers in README.md
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| .gitattributes | Creates new file configuring uv.lock as binary with uv-lock custom merge driver |
| README.md | Adds development setup documentation for configuring the uv-lock merge driver locally |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
This marks uv.lock as a binary file to suppress diffs and configures a custom merge driver 'uv-lock' to automatically regenerate the lockfile on conflicts.
Instructions for configuring the local git merge driver have been added to README.md.