debdolph
Ausgangszeichenkette hinzugefügt |
|
debdolph
Ausgangszeichenkette hinzugefügt |
|
debdolph
Ausgangszeichenkette hinzugefügt |
|
debdolph
Ausgangszeichenkette hinzugefügt |
|
debdolph
Ausgangszeichenkette hinzugefügt |
|
debdolph
Repository zurückgesetzt |
Repository zurückgesetzt
vor 3 Jahren
|
debdolph
Repository-Umbasierung 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 |
–
Repository-Umbasierung 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 |
–
Repository-Umbasierung 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 |
–
Repository-Umbasierung 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 |
–
Repository-Umbasierung 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 |
–
Repository-Umbasierung 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 |
–
Repository-Umbasierung 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 |
–
Repository-Umbasierung 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 |
–
Repository-Umbasierung 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 |
–
Repository-Umbasierung 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 |
–
Repository-Umbasierung 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 |
–
Repository-Umbasierung 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 |
–
Repository-Umbasierung 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 |
–
Repository-Umbasierung 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 |