 otacke
Repository rebase failed |
3 years ago
|
|
otacke
Repository rebase failed |
First, rewinding head to replay your work on top of it... Applying: German Valero <gvalero@unam.mx> updated Spanish (Mexico) (es-MX) (es-MX) translation using Weblate @ translate-h5p.tk. Using index info to reconstruct a base tree... M language/es-mx.json Falling back to patching base and 3-way merge... Auto-merging language/es-mx.json CONFLICT (content): Merge conflict in language/es-mx.json error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 German Valero <gvalero@unam.mx> updated Spanish (Mexico) (es-MX) (es-MX) 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 |
|
otacke
Language added |
German
3 years ago
|
|
otacke
Resource updated |
The “
language/de.json” file was changed.
3 years ago
|
|
otacke
Repository rebase failed |
First, rewinding head to replay your work on top of it... Applying: German Valero <gvalero@unam.mx> updated Spanish (Mexico) (es-MX) (es-MX) translation using Weblate @ translate-h5p.tk. Using index info to reconstruct a base tree... M language/es-mx.json Falling back to patching base and 3-way merge... Auto-merging language/es-mx.json CONFLICT (content): Merge conflict in language/es-mx.json error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 German Valero <gvalero@unam.mx> updated Spanish (Mexico) (es-MX) (es-MX) 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
Alert triggered |
Could not update the repository.
3 years ago
|
 serettig
Repository rebase failed |
First, rewinding head to replay your work on top of it... Applying: German Valero <gvalero@unam.mx> updated Spanish (Mexico) (es-MX) (es-MX) translation using Weblate @ translate-h5p.tk. Using index info to reconstruct a base tree... M language/es-mx.json Falling back to patching base and 3-way merge... Auto-merging language/es-mx.json CONFLICT (content): Merge conflict in language/es-mx.json error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 German Valero <gvalero@unam.mx> updated Spanish (Mexico) (es-MX) (es-MX) 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
Alert triggered |
Repository outdated.
3 years ago
|
|
None
Alert triggered |
Could not update the repository.
3 years ago
|
|
serettig
Repository rebase failed |
First, rewinding head to replay your work on top of it... Applying: German Valero <gvalero@unam.mx> updated Spanish (Mexico) (es-MX) (es-MX) translation using Weblate @ translate-h5p.tk. Using index info to reconstruct a base tree... M language/es-mx.json Falling back to patching base and 3-way merge... Auto-merging language/es-mx.json CONFLICT (content): Merge conflict in language/es-mx.json error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 German Valero <gvalero@unam.mx> updated Spanish (Mexico) (es-MX) (es-MX) 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 |
 germanvaleroelizondo
Repository rebase failed |
First, rewinding head to replay your work on top of it... Applying: German Valero <gvalero@unam.mx> updated Spanish (Mexico) (es-MX) (es-MX) translation using Weblate @ translate-h5p.tk. Using index info to reconstruct a base tree... M language/es-mx.json Falling back to patching base and 3-way merge... Auto-merging language/es-mx.json CONFLICT (content): Merge conflict in language/es-mx.json error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 German Valero <gvalero@unam.mx> updated Spanish (Mexico) (es-MX) (es-MX) 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
Repository rebase failed |
First, rewinding head to replay your work on top of it... Applying: German Valero <gvalero@unam.mx> updated Spanish (Mexico) (es-MX) (es-MX) translation using Weblate @ translate-h5p.tk. Using index info to reconstruct a base tree... M language/es-mx.json Falling back to patching base and 3-way merge... Auto-merging language/es-mx.json CONFLICT (content): Merge conflict in language/es-mx.json error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 German Valero <gvalero@unam.mx> updated Spanish (Mexico) (es-MX) (es-MX) 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: German Valero <gvalero@unam.mx> updated Spanish (Mexico) (es-MX) (es-MX) translation using Weblate @ translate-h5p.tk. Using index info to reconstruct a base tree... M language/es-mx.json Falling back to patching base and 3-way merge... Auto-merging language/es-mx.json CONFLICT (content): Merge conflict in language/es-mx.json error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 German Valero <gvalero@unam.mx> updated Spanish (Mexico) (es-MX) (es-MX) 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
Resource updated |
The “
language/nl.json” file was changed.
3 years ago
|
|
serettig
Resource updated |
The “
language/es.json” file was changed.
3 years ago
|
|
serettig
Resource updated |
The “
language/es-mx.json” file was changed.
3 years ago
|
|
serettig
Resource updated |
The “
language/.en.json” file was changed.
3 years ago
|
|
serettig
Repository rebased |
Repository rebased
3 years ago
|