Merge pull request #69 from saritasa-nest/fix-git-blame-script

Fix git blame copy script
saritasa-nest · Feb 9, 2024 · 51a8369 · 51a8369
2 parents f71bdaf + e9160ed
commit 51a8369
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,8 @@ We follow [Semantic Versions](https://semver.org/).
 
 ## unreleased
 
+Fix `git.blame-copy` in case if merge conflict between files occurs.
+
 ## 1.0.0
 
 First stable release

diff --git a/saritasa_invocations/git.py b/saritasa_invocations/git.py
@@ -196,7 +196,14 @@ def _merge_commits(
     message: str,
 ) -> None:
     """Merge passed commits."""
-    context.run(f"git merge {' '.join(commits)} -m '{message}'")
+    context.run(
+        f"git merge {' '.join(commits)} -m '{message}'",
+        warn=True,
+    )
+    # create commit in case if merge conflict occurs
+    context.run(
+        f"git commit --no-verify -a -n -m '{message}'",
+    )
 
 
 def _move_file(