Add union merge driver for RELEASENOTES.md to reduce merge conflicts - #2333
Open
mazhelez wants to merge 1 commit into
Open
Add union merge driver for RELEASENOTES.md to reduce merge conflicts#2333mazhelez wants to merge 1 commit into
mazhelez wants to merge 1 commit into
Conversation
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
mazhelez
enabled auto-merge (squash)
July 28, 2026 11:23
freddydk
approved these changes
Jul 29, 2026
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.
❔What, Why & How
Almost every PR edits the top region of
RELEASENOTES.md, and theDeploy.yaml"Calculate Release Notes" step reads everything from the top of the file down to the first## vX.Yheader. Because every PR touches that same region, having several PRs in flight reliably produces merge conflicts in the changelog.This adds a repo-root
.gitattributesthat assigns the built-inunionmerge driver toRELEASENOTES.md:With
union, git keeps the added lines from both sides during a merge/rebase instead of raising a conflict.unionis a built-in git driver, so it takes effect automatically on clone/pull — no per-machine git config is required.Notes / caveats
uniondoes not guarantee ordering and can occasionally duplicate a line on rebase — harmless for a bullet-list changelog; just glance at the unreleased section before cutting a release.main.This is intended as a quick, low-risk mitigation. A more robust fragment-based approach (each PR drops a separate file, assembled at release time) can be considered as a follow-up.
Related to issue: #
✅ Checklist