NoneFirst, rewinding head to replay your work on top of it... Applying: Translated on translate.pretix.eu (Arabic) Using index info to reconstruct a base tree... M pretixeu/pretixeu/locale/ar/LC_MESSAGES/django.po Falling back to patching base and 3-way merge... Auto-merging pretixeu/pretixeu/locale/ar/LC_MESSAGES/django.po Applying: Translated on translate.pretix.eu (German (informal)) Using index info to reconstruct a base tree... M pretixeu/pretixeu/locale/de_Informal/LC_MESSAGES/django.po Falling back to patching base and 3-way merge... Auto-merging pretixeu/pretixeu/locale/de_Informal/LC_MESSAGES/django.po CONFLICT (content): Merge conflict in pretixeu/pretixeu/locale/de_Informal/LC_MESSAGES/django.po error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0002 Translated on translate.pretix.eu (German (informal)) Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". (1)24 minutes ago
First, rewinding head to replay your work on top of it... Applying: Translated on translate.pretix.eu (Arabic) Using index info to reconstruct a base tree... M pretixeu/pretixeu/locale/ar/LC_MESSAGES/django.po Falling back to patching base and 3-way merge... Auto-merging pretixeu/pretixeu/locale/ar/LC_MESSAGES/django.po Applying: Translated on translate.pretix.eu (German (informal)) Using index info to reconstruct a base tree... M pretixeu/pretixeu/locale/de_Informal/LC_MESSAGES/django.po Falling back to patching base and 3-way merge... Auto-merging pretixeu/pretixeu/locale/de_Informal/LC_MESSAGES/django.po CONFLICT (content): Merge conflict in pretixeu/pretixeu/locale/de_Informal/LC_MESSAGES/django.po error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0002 Translated on translate.pretix.eu (German (informal)) Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". (1)37 minutes ago