 matthew
Failed rebase on repository |
9 months ago
|
|
matthew
Component unlocked |
Component unlocked
9 months ago
|
|
matthew
Failed rebase on repository |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (Arabic) Using index info to reconstruct a base tree... M translation-unity_ar.xlf Falling back to patching base and 3-way merge... Auto-merging translation-unity_ar.xlf CONFLICT (content): Merge conflict in translation-unity_ar.xlf 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 (Arabic) 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)9 months ago |
 None
Component locked |
The component was automatically locked because of an alert.
9 months ago
|
|
None
New alert |
Could not merge the repository.
9 months ago
|
|
None
Failed rebase on repository |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (Arabic) Using index info to reconstruct a base tree... M translation-unity_ar.xlf Falling back to patching base and 3-way merge... Auto-merging translation-unity_ar.xlf CONFLICT (content): Merge conflict in translation-unity_ar.xlf 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 (Arabic) 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)9 months ago |
|
matthew
Translation changed |
|
|
matthew
Translation changed TestProject / Unity — Korean |
|
|
matthew
Translation changed TestProject / Unity — Japanese |
|
|
matthew
Translation changed TestProject / Unity — Italian |
|
|
matthew
Translation changed TestProject / Unity — French |
|
|
matthew
Translation changed TestProject / Unity — Spanish |
|
|
matthew
Translation changed TestProject / Unity — German |
|
|
matthew
Translation changed TestProject / Unity — Arabic |
|
|
matthew
Translation changed |
|
|
matthew
Marked for edit TestProject / Unity — Spanish |
|
|
matthew
New translation TestProject / Unity — Spanish |
|