diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0a85ad0..89a2377 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@ We follow [Semantic Versions](https://semver.org/).
 
 ## unreleased
 
+- Fix `git.blame-copy` merging without conflicts
+
 ## 1.3.0
 
 - Add params for `system.chown`(`owner` and `path`)
diff --git a/saritasa_invocations/git.py b/saritasa_invocations/git.py
index acea30d..a559474 100644
--- a/saritasa_invocations/git.py
+++ b/saritasa_invocations/git.py
@@ -237,6 +237,7 @@ def _merge_commits(
     # create commit in case if merge conflict occurs
     context.run(
         f"git commit --no-verify -a -n -m '{message}'",
+        warn=True,
     )