Skip to content

Commit

Permalink
Add comment
Browse files Browse the repository at this point in the history
  • Loading branch information
yalef committed Feb 8, 2024
1 parent 4c890d8 commit e9160ed
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions saritasa_invocations/git.py
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ def _merge_commits(
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}'",
)
Expand Down

0 comments on commit e9160ed

Please sign in to comment.