Merge pull request #1062 from arogge/dev/arogge/master/changelog-unio…

…n-merge git: set merge strategy for `CHANGELOG.md` to `union`
bareos · Feb 4, 2022 · 3790ade · 3790ade
2 parents 746e7a1 + 4853b44
commit 3790ade
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+CHANGELOG.md merge=union
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,7 @@ and since Bareos version 20 this project adheres to [Semantic Versioning](https:
 
 ### Changed
 - webui: remove an unnecessary .bvfs_get_jobids and buildSubtree() call [PR #1050]
+- git: set merge strategy for CHANGELOG.md to union [PR #1062]
 
 ### Deprecated