Auto-resolve changelog merges with union driver#3127
Open
p3dr0rv wants to merge 2 commits into
Open
Conversation
p3dr0rv
added
the
No-Changelog
p3dr0rv
changed the title
|
❌ Work item link check failed. Description does not contain AB#{ID}. Click here to Learn more. |
Contributor
There was a problem hiding this comment.
Pull request overview
This PR configures Git’s merge behavior to automatically resolve conflicts in the repository’s append-only changelog.txt by using the built-in union merge driver, reducing manual conflict resolution during frequent parallel changelog updates.
Changes:
- Add a root
.gitattributesfile. - Configure
changelog.txtto usemerge=unionso concurrent additions are combined automatically.
siddhijain
approved these changes
May 21, 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.
Summary
Validation