User avatar None

Alert triggered

Could not merge the repository. 3 years ago
User avatar serettig

Repository rebase failed

First, rewinding head to replay your work on top of it...
Applying: Pheerapath Nunnararat <interactivehong@gmail.com> updated Thai translation using Weblate @ translate-h5p.tk.
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging language/th.json
CONFLICT (add/add): Merge conflict in language/th.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Pheerapath Nunnararat <interactivehong@gmail.com> updated Thai 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
User avatar luminate

Suggestion added

3 years ago
User avatar luminate

Suggestion removed

3 years ago
User avatar luminate

Suggestion added

3 years ago
User avatar luminate

Suggestion added

3 years ago
User avatar luminate

Suggestion added

3 years ago
User avatar luminate

Suggestion added

3 years ago
User avatar luminate

Suggestion added

3 years ago
User avatar interactivehong

Translation approved

3 years ago
User avatar interactivehong

Translation approved

3 years ago
User avatar interactivehong

Translation approved

3 years ago
User avatar interactivehong

Translation approved

3 years ago
User avatar interactivehong

Translation added

3 years ago
User avatar interactivehong

Translation approved

3 years ago
User avatar interactivehong

Translation approved

3 years ago
User avatar interactivehong

Translation approved

3 years ago
User avatar interactivehong

Translation approved

3 years ago
User avatar interactivehong

Translation approved

3 years ago
User avatar interactivehong

Translation approved

3 years ago

Search