Use union merge strategy for release notes to avoid conflicts#19420
Open
Use union merge strategy for release notes to avoid conflicts#19420
Conversation
Release notes files are append-only unordered lists where each PR adds one entry. With the default merge strategy, concurrent PRs that both append under the same heading (e.g. ### Fixed) produce merge conflicts even though order doesn't matter. The union merge driver keeps both sides, eliminating these conflicts. This is consistent with the existing use of merge=union for .sln and project files in this repo. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Contributor
✅ No release notes required |
abonie
approved these changes
Mar 12, 2026
github-project-automation
bot
moved this from New
to In Progress
in F# Compiler and Tooling
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
2 participants
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.
Release notes files are append-only unordered lists where each PR adds one entry. With the default merge strategy, concurrent PRs that both append under the same heading (e.g.
### Fixed) produce merge conflicts even though order doesn't matter.The
unionmerge driver keeps both sides, eliminating these spurious conflicts. This is consistent with the existing use ofmerge=unionfor.slnand project files in this repo.