summary refs log tree commit diff
path: root/changelog.d/17399.doc
diff options
context:
space:
mode:
authorEric Eastwood <eric.eastwood@beta.gouv.fr>2024-07-04 11:21:25 -0500
committerGitHub <noreply@github.com>2024-07-04 17:21:25 +0100
commita9d2e40ea4533e3f5fd369e817319e34f2a7dde9 (patch)
treecd81798f8909955c54cfc69cb609e03f9291e6eb /changelog.d/17399.doc
parentMerge branch 'master' into develop (diff)
downloadsynapse-a9d2e40ea4533e3f5fd369e817319e34f2a7dde9.tar.xz
Changelog entries only get merged if they have the same content and extension (#17399)
Changelog entries only get merged if they have the same content and
extension

See
https://github.com/element-hq/synapse/pull/17301#discussion_r1665387218
Diffstat (limited to 'changelog.d/17399.doc')
-rw-r--r--changelog.d/17399.doc1
1 files changed, 1 insertions, 0 deletions
diff --git a/changelog.d/17399.doc b/changelog.d/17399.doc
new file mode 100644
index 0000000000..7a3fcf24c0
--- /dev/null
+++ b/changelog.d/17399.doc
@@ -0,0 +1 @@
+Clarify that changelog content *and file extension* need to match in order for entries to merge.