Skip to content

[Internal] Changelog: Adds .gitattributes union merge driver for changelog files #5889

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

Open
NaluTripician wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[Internal] Changelog: Adds .gitattributes union merge driver for changelog files #5889

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93c6080
[Internal] Changelog: Adds .gitattributes union merge driver for chan…
NaluTripician May 19, 2026
fb1ea07
[Internal] Changelog: Refactors gitattributes patterns to anchor to r…
Copilot May 19, 2026
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
12 changes: 12 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Auto-resolve changelog merge conflicts by taking both sides' bullets.
# Background: PR #5864 moved the SDK to a per-PR `### Unreleased` model where
# every shipped-source PR appends a bullet to the same anchor, and each release
# PR (e.g. #5876) moves those bullets into a versioned section. Both shapes
# produce textbook merge conflicts. The `union` driver takes lines from both
# sides on conflict, which is exactly the "take both bullets" rule already
# documented in CONTRIBUTING.md (## Changelog entry > Merge conflicts).
# Caveat: if two PRs edit the SAME line (rare for append-only bullet lists),
# union loses information silently. For the Unreleased + versioned-section
# pattern this is acceptable; reviewers should still eyeball changelog diffs.
changelog.md merge=union
Comment thread
NaluTripician marked this conversation as resolved.
Outdated
Comment thread
NaluTripician marked this conversation as resolved.
Outdated
Microsoft.Azure.Cosmos/FaultInjection/changelog.md merge=union
Loading