Skip to content

Use union merge strategy for release notes to avoid conflicts #19420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
T-Gro merged 1 commit into from
Mar 13, 2026
+4 −0
Merged

Use union merge strategy for release notes to avoid conflicts #19420

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
*.fsproj text merge=union
*.dbproj text merge=union

# Release notes are append-only unordered lists; union merge avoids conflicts
# when multiple PRs each add an entry under the same heading.
docs/release-notes/**/*.md text merge=union

# Standard to msysgit
*.doc diff=astextplain
*.DOC diff=astextplain
Expand Down
Loading