-
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy path.gitattributes
More file actions
10 lines (10 loc) · 679 Bytes
/
Copy path.gitattributes
File metadata and controls
10 lines (10 loc) · 679 Bytes
1
2
3
4
5
6
7
8
9
10
# CHANGELOG.md is a GENERATED artifact — it is NOT committed in PRs.
# PRs commit only a changelog.d/<id>.md fragment; CHANGELOG.md is compiled
# from those fragments at release time (see changelog.d/README.md), so
# concurrent PRs never touch CHANGELOG.md and cannot conflict on it.
#
# A former `CHANGELOG.md merge=union` driver was removed 2026-06-14: GitHub
# ignores .gitattributes merge drivers for server-side PR merges, so it never
# prevented the conflict; and on a real local conflict, line-union produces
# output that fails `build-changelog.py --check`. Not committing the generated
# file in PRs is the actual structural fix — do not re-add a merge driver here.