From c62941cff8ab5b21789ffc32dd0fa2196bca23b0 Mon Sep 17 00:00:00 2001
From: florian <f.spreckelsen@inidscale.com>
Date: Tue, 1 Nov 2022 17:11:26 +0100
Subject: [PATCH] DOC: Update changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51aa8cf0..0b9f7a0c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   th above `empty_diff` function). Formerly this would have caused a merge
   conflict if the referenced record(s) were identical, but stored in different
   Python objects.
+* `apiutils.merge_entities` now has an optional `force` argument (defaults to
+  `False`, i.e., the old behavior) which determines whether in case of merge
+  conflicts errors will be raised or the properties and attributes of entity A
+  will be overwritten by entity B.
 
 ### Deprecated ###
 
-- 
GitLab