User avatar Marc Van Opstal

Repository merge failed

Auto-merging language/nb.json
CONFLICT (content): Merge conflict in language/nb.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)
3 months ago
User avatar Marc Van Opstal

Repository rebase failed

warning: skipped previously applied commit fcf9304
warning: skipped previously applied commit a03ae25
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/1)
Auto-merging language/nb.json
CONFLICT (content): Merge conflict in language/nb.json
error: could not apply 47e66d7... 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 47e66d7... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk.
 (1)
3 months ago
User avatar Marc Van Opstal

Repository merge failed

Auto-merging language/nb.json
CONFLICT (content): Merge conflict in language/nb.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)
3 months ago
User avatar Marc Van Opstal

Repository merge failed

Auto-merging language/nb.json
CONFLICT (content): Merge conflict in language/nb.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)
3 months ago

Search