–
Änderungen per Push übertragen |
Änderungen per Push übertragen
vor 3 Jahren
|
–
Repository zusammengeführt |
Repository zusammengeführt
vor 3 Jahren
|
–
Umbasieren auf das Repository ist fehlgeschlagen |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M aleksis/apps/alsijil/locale/de_DE/LC_MESSAGES/django.po Falling back to patching base and 3-way merge... Auto-merging aleksis/apps/alsijil/locale/de_DE/LC_MESSAGES/django.po CONFLICT (content): Merge conflict in aleksis/apps/alsijil/locale/de_DE/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 0001 Translated using Weblate (German) 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)vor 3 Jahren |
–
Änderungen per Push übertragen |
Änderungen per Push übertragen
vor 3 Jahren
|
–
Repository umbasiert |
Repository umbasiert
vor 3 Jahren
|
debdolph
Umbasieren auf das Repository ist fehlgeschlagen |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M po/en.po Falling back to patching base and 3-way merge... Auto-merging po/en.po CONFLICT (content): Merge conflict in po/en.po error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Translated using Weblate (English) 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)vor 3 Jahren |
debdolph
Komponente entsperrt |
Komponente entsperrt
vor 3 Jahren
|
debdolph
Umbasieren auf das Repository ist fehlgeschlagen |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M po/en.po Falling back to patching base and 3-way merge... Auto-merging po/en.po CONFLICT (content): Merge conflict in po/en.po error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Translated using Weblate (English) 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)vor 3 Jahren |
debdolph
Umbasieren auf das Repository ist fehlgeschlagen |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M po/en.po Falling back to patching base and 3-way merge... Auto-merging po/en.po CONFLICT (content): Merge conflict in po/en.po error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Translated using Weblate (English) 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)vor 3 Jahren |
debdolph
Umbasieren auf das Repository ist fehlgeschlagen |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M po/en.po Falling back to patching base and 3-way merge... Auto-merging po/en.po CONFLICT (content): Merge conflict in po/en.po error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Translated using Weblate (English) 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)vor 3 Jahren |
–
Komponente gesperrt |
Die Komponente wurde aufgrund einer Warnung automatisch gesperrt.
vor 3 Jahren
|
–
Neue Warnung |
Das Repository konnte nicht zusammengeführt werden.
vor 3 Jahren
|
–
Umbasieren auf das Repository ist fehlgeschlagen |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M po/en.po Falling back to patching base and 3-way merge... Auto-merging po/en.po CONFLICT (content): Merge conflict in po/en.po error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Translated using Weblate (English) 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)vor 3 Jahren |
Niklas Bildhauer
Geänderte Übersetzung |
|
debdolph
Vorschlag angenommen |
|
debdolph
Neuer Mitwirkender |
Neuer Mitwirkender
vor 3 Jahren
|
Niklas Bildhauer
Geänderte Übersetzung |
|
Niklas Bildhauer
Geänderte Übersetzung |
|
Niklas Bildhauer
Geänderte Übersetzung |
|
Niklas Bildhauer
Geänderte Übersetzung |
|