otacke
Repository rebase failed |
8 days ago
|
otacke
Repository rebase failed |
warning: skipped previously applied commit 5e8a576 warning: skipped previously applied commit 07f4e27 warning: skipped previously applied commit 6894a2e hint: use --reapply-cherry-picks to include skipped commits hint: Disable this message with "git config advice.skippedCherryPicks false" Rebasing (1/3) Rebasing (2/3) Auto-merging language/sk.json CONFLICT (content): Merge conflict in language/sk.json error: could not apply b9202f4... "Mgr. Ing. Vladimír Výboh" <vybohv@gmail.com> updated Slovak translation using Weblate @ translate-h5p.tk. hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply b9202f4... "Mgr. Ing. Vladimír Výboh" <vybohv@gmail.com> updated Slovak translation using Weblate @ translate-h5p.tk. (1)8 days ago |
otacke
Repository rebase failed |
warning: skipped previously applied commit 5e8a576 warning: skipped previously applied commit 07f4e27 warning: skipped previously applied commit 6894a2e hint: use --reapply-cherry-picks to include skipped commits hint: Disable this message with "git config advice.skippedCherryPicks false" Rebasing (1/3) Rebasing (2/3) Auto-merging language/sk.json CONFLICT (content): Merge conflict in language/sk.json error: could not apply b9202f4... "Mgr. Ing. Vladimír Výboh" <vybohv@gmail.com> updated Slovak translation using Weblate @ translate-h5p.tk. hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply b9202f4... "Mgr. Ing. Vladimír Výboh" <vybohv@gmail.com> updated Slovak translation using Weblate @ translate-h5p.tk. (1)8 days ago |
tdombos
Suggestion added |
|
None
Component locked |
The component was automatically locked because of an alert.
a month ago
|
None
Alert triggered |
Could not merge the repository.
a month ago
|
None
Repository rebase failed |
Rebasing (1/6) Auto-merging language/nb.json CONFLICT (content): Merge conflict in language/nb.json error: could not apply 5e8a576... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk. hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 5e8a576... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk. (1)a month ago |
None
Changes committed |
Changes committed
a month ago
|
ginpama
Suggestion accepted |
|
grays552
Suggestion added |
|
None
Alert triggered |
Repository outdated.
2 months ago
|
None
Changes committed |
Changes committed
6 months ago
|
vybohv
Translation approved |
|
vybohv
Translation changed |
|
None
Changes committed |
Changes committed
6 months ago
|
nadavkav
Translation completed |
Translation completed
6 months ago
|
nadavkav
Translation approved |
|
nadavkav
Translation approved |
|
nadavkav
Translation approved |
|
nadavkav
Translation approved |
|