diff --git a/git_redmine.py b/git_redmine.py index 95d250a..7a2f20d 100644 --- a/git_redmine.py +++ b/git_redmine.py @@ -183,7 +183,7 @@ def apply_attachments(repo, issue): attachment = attachments[index] content = attachment.download().content try: - p = repo.git.execute(['git', 'am'], istream=subprocess.PIPE, as_process=True) + p = repo.git.execute(['git', 'am', '-3'], istream=subprocess.PIPE, as_process=True) p.communicate(content) except Exception as e: print(e)