lucifer
Repository rebase failed |
2 years ago
|
lucifer
Repository rebase failed |
Rebasing (1/7) error: could not apply a6e82c8... Nurbyek Khuansh <lighternurbek@gmail.com> added Mongolian 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 a6e82c8... Nurbyek Khuansh <lighternurbek@gmail.com> added Mongolian translation using Weblate @ translate-h5p.tk. CONFLICT (add/add): Merge conflict in language/mn.json Auto-merging language/mn.json (1)2 years ago |
lucifer
Repository merge failed |
CONFLICT (add/add): Merge conflict in language/mn.json Auto-merging language/mn.json Automatic merge failed; fix conflicts and then commit the result. (1)2 years ago |
lucifer
Repository merge failed |
CONFLICT (add/add): Merge conflict in language/mn.json Auto-merging language/mn.json Automatic merge failed; fix conflicts and then commit the result. (1)2 years ago |
lucifer
Repository rebase failed |
Rebasing (1/7) error: could not apply a6e82c8... Nurbyek Khuansh <lighternurbek@gmail.com> added Mongolian 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 a6e82c8... Nurbyek Khuansh <lighternurbek@gmail.com> added Mongolian translation using Weblate @ translate-h5p.tk. CONFLICT (add/add): Merge conflict in language/mn.json Auto-merging language/mn.json (1)2 years ago |
lucifer
Repository rebase failed |
Rebasing (1/7) error: could not apply a6e82c8... Nurbyek Khuansh <lighternurbek@gmail.com> added Mongolian 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 a6e82c8... Nurbyek Khuansh <lighternurbek@gmail.com> added Mongolian translation using Weblate @ translate-h5p.tk. CONFLICT (add/add): Merge conflict in language/mn.json Auto-merging language/mn.json (1)2 years ago |
lucifer
Repository rebase failed |
Rebasing (1/7) error: could not apply a6e82c8... Nurbyek Khuansh <lighternurbek@gmail.com> added Mongolian 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 a6e82c8... Nurbyek Khuansh <lighternurbek@gmail.com> added Mongolian translation using Weblate @ translate-h5p.tk. CONFLICT (add/add): Merge conflict in language/mn.json Auto-merging language/mn.json (1)2 years ago |
None
Automatically translated |
|
None
Automatically translated |
|
None
Automatically translated |
|
None
Automatically translated |
|
None
Automatically translated |
|
None
Automatically translated |
|
None
Automatically translated |
|
None
Automatically translated |
|
None
Automatically translated |
|
None
Automatically translated |
|
None
Automatically translated |
|
None
Automatically translated |
|
None
Automatically translated |
|