use 3-way merge when applying attached patchs
This commit is contained in:
parent
b3061993e0
commit
48650d3343
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue