User avatar otacke

Repository rebase failed

Rebasing (1/4)
error: could not apply e7aa772... Matīss Sīlis <matiss.silis@gmail.com> updated Latvian 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".
Could not apply e7aa772... Matīss Sīlis <matiss.silis@gmail.com> updated Latvian translation using Weblate @ translate-h5p.tk.
Auto-merging language/lv.json
CONFLICT (content): Merge conflict in language/lv.json
 (1)
2 years ago
User avatar otacke

Repository rebase failed

Rebasing (1/4)
error: could not apply e7aa772... Matīss Sīlis <matiss.silis@gmail.com> updated Latvian 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".
Could not apply e7aa772... Matīss Sīlis <matiss.silis@gmail.com> updated Latvian translation using Weblate @ translate-h5p.tk.
Auto-merging language/lv.json
CONFLICT (content): Merge conflict in language/lv.json
 (1)
2 years ago
User avatar otacke

Repository merge failed

Auto-merging language/lv.json
CONFLICT (content): Merge conflict in language/lv.json
Auto-merging language/eu.json
Auto-merging language/es.json
Auto-merging language/es-mx.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)
2 years ago
User avatar otacke

Repository merge failed

Auto-merging language/lv.json
CONFLICT (content): Merge conflict in language/lv.json
Auto-merging language/eu.json
Auto-merging language/es.json
Auto-merging language/es-mx.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)
2 years ago
User avatar None

Repository rebase failed

Rebasing (1/4)
error: could not apply e7aa772... Matīss Sīlis <matiss.silis@gmail.com> updated Latvian 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".
Could not apply e7aa772... Matīss Sīlis <matiss.silis@gmail.com> updated Latvian translation using Weblate @ translate-h5p.tk.
Auto-merging language/lv.json
CONFLICT (content): Merge conflict in language/lv.json
 (1)
2 years ago
User avatar germanvaleroelizondo

Repository rebase failed

Rebasing (1/3)
error: could not apply e7aa772... Matīss Sīlis <matiss.silis@gmail.com> updated Latvian 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".
Could not apply e7aa772... Matīss Sīlis <matiss.silis@gmail.com> updated Latvian translation using Weblate @ translate-h5p.tk.
Auto-merging language/lv.json
CONFLICT (content): Merge conflict in language/lv.json
 (1)
2 years ago
User avatar None

Repository rebase failed

Rebasing (1/3)
error: could not apply e7aa772... Matīss Sīlis <matiss.silis@gmail.com> updated Latvian 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".
Could not apply e7aa772... Matīss Sīlis <matiss.silis@gmail.com> updated Latvian translation using Weblate @ translate-h5p.tk.
Auto-merging language/lv.json
CONFLICT (content): Merge conflict in language/lv.json
 (1)
2 years ago
User avatar None

Component locked

The component was automatically locked because of an alert. 2 years ago
User avatar None

Alert triggered

Could not merge the repository. 2 years ago
User avatar None

Repository rebase failed

Rebasing (1/2)
error: could not apply e7aa772... Matīss Sīlis <matiss.silis@gmail.com> updated Latvian 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".
Could not apply e7aa772... Matīss Sīlis <matiss.silis@gmail.com> updated Latvian translation using Weblate @ translate-h5p.tk.
Auto-merging language/lv.json
CONFLICT (content): Merge conflict in language/lv.json
 (1)
2 years ago
User avatar germanvaleroelizondo

Translation approved

2 years ago
User avatar germanvaleroelizondo

Translation approved

2 years ago
User avatar None

Repository rebased

Repository rebased 2 years ago
User avatar soikins

Translation approved

2 years ago
User avatar serettig

Changes pushed

Changes pushed 2 years ago
User avatar serettig

Repository rebased

Repository rebased 2 years ago
User avatar serettig

Translation changed

2 years ago
User avatar serettig

Translation changed

2 years ago
User avatar serettig

Changes pushed

Changes pushed 2 years ago

Search