 None
Repository rebase failed |
5 months ago
|
|
None
Repository notification received |
GitHub: https://github.com/otacke/h5p-tabs, master
5 months ago
|
 otacke
Repository rebase failed |
Rebasing (1/2) error: could not apply 9e212b7... Anonymous <noreply@weblate.org> updated Swedish 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 9e212b7... Anonymous <noreply@weblate.org> updated Swedish translation using Weblate @ translate-h5p.tk. CONFLICT (add/add): Merge conflict in language/sv.json Auto-merging language/sv.json (1)5 months ago |
 david.song
Repository rebase failed |
Rebasing (1/2) error: could not apply 9e212b7... Anonymous <noreply@weblate.org> updated Swedish 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 9e212b7... Anonymous <noreply@weblate.org> updated Swedish translation using Weblate @ translate-h5p.tk. CONFLICT (add/add): Merge conflict in language/sv.json Auto-merging language/sv.json (1)6 months ago |
|
david.song
Repository rebase failed |
Rebasing (1/2) error: could not apply 9e212b7... Anonymous <noreply@weblate.org> updated Swedish 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 9e212b7... Anonymous <noreply@weblate.org> updated Swedish translation using Weblate @ translate-h5p.tk. CONFLICT (add/add): Merge conflict in language/sv.json Auto-merging language/sv.json (1)6 months ago |
|
david.song
Repository rebase failed |
Rebasing (1/2) error: could not apply 9e212b7... Anonymous <noreply@weblate.org> updated Swedish 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 9e212b7... Anonymous <noreply@weblate.org> updated Swedish translation using Weblate @ translate-h5p.tk. CONFLICT (add/add): Merge conflict in language/sv.json Auto-merging language/sv.json (1)6 months ago |