otacke
Repository rebase failed |
8 days ago
|
otacke
Repository rebase failed |
Rebasing (1/5) dropping c471ac87b9881035fc2c117e9bfb53ea2d2f320a Kovács Márk <kovacs.mark@htk.uni-pannon.hu> updated Hungarian translation using Weblate @ translate-h5p.tk. -- patch contents already upstream Rebasing (2/5) dropping 60f4edf3cce0dad7b37e226e9b382f0f9c0262c6 Paolo Mauri <paolo@paolomauri.it> updated Italian translation using Weblate @ translate-h5p.tk. -- patch contents already upstream Rebasing (3/5) Rebasing (4/5) Rebasing (5/5) Auto-merging language/nb.json CONFLICT (content): Merge conflict in language/nb.json error: could not apply fe66304... 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 fe66304... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk. (1)8 days ago |
None
Component locked |
The component was automatically locked because of an alert.
8 days ago
|
None
Alert triggered |
Could not merge the repository.
8 days ago
|
otacke
Repository rebase failed |
Rebasing (1/5) dropping c471ac87b9881035fc2c117e9bfb53ea2d2f320a Kovács Márk <kovacs.mark@htk.uni-pannon.hu> updated Hungarian translation using Weblate @ translate-h5p.tk. -- patch contents already upstream Rebasing (2/5) dropping 60f4edf3cce0dad7b37e226e9b382f0f9c0262c6 Paolo Mauri <paolo@paolomauri.it> updated Italian translation using Weblate @ translate-h5p.tk. -- patch contents already upstream Rebasing (3/5) Rebasing (4/5) Rebasing (5/5) Auto-merging language/nb.json CONFLICT (content): Merge conflict in language/nb.json error: could not apply fe66304... 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 fe66304... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk. (1)8 days ago |
None
Changes committed |
Changes committed
3 months ago
|
None
Changes committed |
Changes committed
3 months ago
|
marionf
Translation approved |
|
marionf
Translation approved |
|
marionf
Translation approved |
|
marionf
Translation approved |
|
marionf
Translation approved |
|
marionf
Translation approved |
|
marionf
Translation approved |
|
marionf
Translation approved |
|
marionf
Translation approved |
|
marionf
Translation approved |
|
marionf
Translation approved |
|
marionf
Translation approved |
|
marionf
Translation approved |
|