use 3-way merge when applying attached patchs

2019-08-06 16:57:54 +02:00 · 2019-08-06 16:57:54 +02:00 · 48650d3343
parent b3061993e0
commit 48650d3343
1 changed files with 1 additions and 1 deletions
--- 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)