chore(none): reduce merge-conflict churn on bookkeeping files - #785
Draft
paulkarayan wants to merge 1 commit into
Draft
chore(none): reduce merge-conflict churn on bookkeeping files#785paulkarayan wants to merge 1 commit into
paulkarayan wants to merge 1 commit into
Conversation
CHANGELOG.md merge=union keeps both sides' appended entries instead of conflicting on the version header -- a built-in git driver, so it works for every contributor with no per-clone setup, and GitHub honors it for mergeability (no more spurious CHANGELOG-only conflicts). uv.lock merge=uv-lock routes lockfile conflicts to a driver that regenerates the lock for contributors who have it configured (dotfiles/bin/setup-uv-merge-driver.sh); harmless no-op otherwise. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
paulkarayan
added
the
prio:whenever
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
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.
Adds a
.gitattributesso bookkeeping files stop generating spurious merge conflicts:CHANGELOG.md merge=union— keeps both sides' appended entries instead of conflicting on the version header. A built-in git driver (no per-clone setup), and GitHub honors it for mergeability, so a CHANGELOG whose only "conflict" is two appended entries no longer shows as conflicting.uv.lock merge=uv-lock— routes lockfile conflicts to a driver that regenerates the lock for contributors who have it configured (dotfiles/bin/setup-uv-merge-driver.sh); a harmless no-op for clones without it (git falls back to the default).Mirrors the same change already made for platform-plugins and platform-api. Motivation: PRs like #781 kept re-conflicting on CHANGELOG.md against every main advance even though both sides only appended entries.
🤖 Generated with Claude Code