 serettig
Changes pushed |
Changes pushed
3 years ago
|
|
serettig
Component unlocked |
Component unlocked
3 years ago
|
 None
Component locked |
The component was automatically locked because of an alert.
3 years ago
|
|
None
Alert triggered |
Could not merge the repository.
3 years ago
|
|
serettig
Repository rebase failed |
First, rewinding head to replay your work on top of it... error: insufficient permission for adding an object to repository database .git/objects fatal: git write-tree failed to write a tree Applying: Jeonghun Oh <totoromaum1@gmail.com> updated Korean translation using Weblate @ translate-h5p.tk. (1)3 years ago |
 germanvaleroelizondo
Changes pushed |
Changes pushed
3 years ago
|
|
germanvaleroelizondo
Changes committed |
Changes committed
3 years ago
|
|
germanvaleroelizondo
Translation approved |
|
|
germanvaleroelizondo
Translation approved |
|
|
germanvaleroelizondo
Translation approved |
|
|
germanvaleroelizondo
Translation approved |
|
|
germanvaleroelizondo
Contributor joined |
Contributor joined
3 years ago
|
|
None
Component unlocked |
Fixing an alert automatically unlocked the component.
3 years ago
|
|
None
Resource updated |
The “
language/sr.json” file was changed.
3 years ago
|
|
None
Resource updated |
The “
language/ko.json” file was changed.
3 years ago
|
|
serettig
Repository rebase failed |
First, rewinding head to replay your work on top of it... Applying: Jeonghun Oh <totoromaum1@gmail.com> updated Korean translation using Weblate @ translate-h5p.tk. Using index info to reconstruct a base tree... M language/ko.json Falling back to patching base and 3-way merge... Auto-merging language/ko.json CONFLICT (content): Merge conflict in language/ko.json error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Jeonghun Oh <totoromaum1@gmail.com> updated Korean translation using Weblate @ translate-h5p.tk. 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)3 years ago |
|
serettig
Repository rebase failed |
First, rewinding head to replay your work on top of it... Applying: Jeonghun Oh <totoromaum1@gmail.com> updated Korean translation using Weblate @ translate-h5p.tk. Using index info to reconstruct a base tree... M language/ko.json Falling back to patching base and 3-way merge... Auto-merging language/ko.json CONFLICT (content): Merge conflict in language/ko.json error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Jeonghun Oh <totoromaum1@gmail.com> updated Korean translation using Weblate @ translate-h5p.tk. 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)3 years ago |
|
None
Component locked |
The component was automatically locked because of an alert.
3 years ago
|
|
None
Alert triggered |
Could not merge the repository.
3 years ago
|
|
None
Repository rebase failed |
First, rewinding head to replay your work on top of it... Applying: Jeonghun Oh <totoromaum1@gmail.com> updated Korean translation using Weblate @ translate-h5p.tk. Using index info to reconstruct a base tree... M language/ko.json Falling back to patching base and 3-way merge... Auto-merging language/ko.json CONFLICT (content): Merge conflict in language/ko.json error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Jeonghun Oh <totoromaum1@gmail.com> updated Korean translation using Weblate @ translate-h5p.tk. 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)3 years ago |