Fix git.blame-copy merging without conflicts

saritasa-nest · Dec 17, 2024 · 141c7ba · 141c7ba
1 parent cc65ebc
commit 141c7ba
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git 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
@@ -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,
     )