otacke
Repository rebase failed |
6 days ago
|
otacke
Repository rebase failed |
Rebasing (1/2) Auto-merging src/scripts/h5p-agamotto.js CONFLICT (content): Merge conflict in src/scripts/h5p-agamotto.js error: could not apply 1b5e8a5... HFP-3880 Fix audio playing even though muted 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 1b5e8a5... HFP-3880 Fix audio playing even though muted (1)6 days ago |
otacke
Repository rebase failed |
warning: skipped previously applied commit d2849c3 warning: skipped previously applied commit e201402 warning: skipped previously applied commit 3c1d762 hint: use --reapply-cherry-picks to include skipped commits hint: Disable this message with "git config advice.skippedCherryPicks false" Rebasing (1/3) Auto-merging language/nb.json CONFLICT (content): Merge conflict in language/nb.json error: could not apply 3b3cac4... 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 3b3cac4... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk. (1)6 days ago |
otacke
Repository rebase failed |
Rebasing (1/1) Auto-merging language/nl.json CONFLICT (content): Merge conflict in language/nl.json error: could not apply 292c3c1... René Breedveld <info@qsento.nl> updated Dutch 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 292c3c1... René Breedveld <info@qsento.nl> updated Dutch translation using Weblate @ translate-h5p.tk. (1)6 days ago |
otacke
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)6 days ago |
otacke
Repository rebase failed |
Rebasing (1/6) Rebasing (2/6) Auto-merging language/zh-cn.json CONFLICT (add/add): Merge conflict in language/zh-cn.json error: could not apply 29ac532... "David.song" <david.song@cangloryeducation.com> updated Chinese (PRC) (zh-cn) translation using Weblate @ Deutsche H5P-Übersetzungscommunity. 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 29ac532... "David.song" <david.song@cangloryeducation.com> updated Chinese (PRC) (zh-cn) translation using Weblate @ Deutsche H5P-Übersetzungscommunity. (1)6 days ago |
otacke
Repository rebase failed |
Rebasing (1/6) Auto-merging .github/workflows/build_and_test.yml CONFLICT (modify/delete): .storybook/main.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release"). Version 31ece51 (Revert "Prepare for release") of .storybook/main.js left in tree. CONFLICT (modify/delete): entries/dist.js deleted in 31ece51 (Revert "Prepare for release") and modified in HEAD. Version HEAD of entries/dist.js left in tree. Auto-merging language/.en.json CONFLICT (content): Merge conflict in language/.en.json Auto-merging language/bg.json CONFLICT (content): Merge conflict in language/bg.json Auto-merging language/ca.json CONFLICT (content): Merge conflict in language/ca.json Auto-merging language/cs.json CONFLICT (content): Merge conflict in language/cs.json Auto-merging language/de.json CONFLICT (content): Merge conflict in language/de.json Auto-merging language/el.json CONFLICT (content): Merge conflict in language/el.json Auto-merging language/es-mx.json CONFLICT (content): Merge conflict in language/es-mx.json Auto-merging language/es.json CONFLICT (content): Merge conflict in language/es.json Auto-merging language/et.json CONFLICT (content): Merge conflict in language/et.json Auto-merging language/eu.json CONFLICT (content): Merge conflict in language/eu.json Auto-merging language/fi.json CONFLICT (content): Merge conflict in language/fi.json Auto-merging language/fr.json CONFLICT (content): Merge conflict in language/fr.json Auto-merging language/gl.json CONFLICT (content): Merge conflict in language/gl.json Auto-merging language/it.json CONFLICT (content): Merge conflict in language/it.json Auto-merging language/ko.json CONFLICT (content): Merge conflict in language/ko.json Auto-merging language/nb.json CONFLICT (content): Merge conflict in language/nb.json Auto-merging language/nl.json CONFLICT (content): Merge conflict in language/nl.json Auto-merging language/nn.json CONFLICT (content): Merge conflict in language/nn.json Auto-merging language/pt-br.json CONFLICT (content): Merge conflict in language/pt-br.json Auto-merging language/sl.json CONFLICT (content): Merge conflict in language/sl.json Auto-merging language/sv.json CONFLICT (content): Merge conflict in language/sv.json Auto-merging library.json CONFLICT (content): Merge conflict in library.json Auto-merging package-lock.json CONFLICT (content): Merge conflict in package-lock.json Auto-merging package.json CONFLICT (content): Merge conflict in package.json Auto-merging scripts/app.js CONFLICT (content): Merge conflict in scripts/app.js Auto-merging scripts/components/Dialog/InteractionContent.js CONFLICT (content): Merge conflict in scripts/components/Dialog/InteractionContent.js Auto-merging scripts/components/Dialog/InteractionContent.scss CONFLICT (content): Merge conflict in scripts/components/Dialog/InteractionContent.scss CONFLICT (modify/delete): scripts/components/FullscreenButton/FullscreenButton.js deleted in 31ece51 (Revert "Prepare for release") and modified in HEAD. Version HEAD of scripts/components/FullscreenButton/FullscreenButton.js left in tree. CONFLICT (modify/delete): scripts/components/FullscreenButton/FullscreenButton.scss deleted in 31ece51 (Revert "Prepare for release") and modified in HEAD. Version HEAD of scripts/components/FullscreenButton/FullscreenButton.scss left in tree. Auto-merging scripts/components/HUD/Buttons/Button/Button.js CONFLICT (content): Merge conflict in scripts/components/HUD/Buttons/Button/Button.js Auto-merging scripts/components/Interactions/HotspotNavButton.js CONFLICT (content): Merge conflict in scripts/components/Interactions/HotspotNavButton.js Auto-merging scripts/components/Interactions/NavigationButton.js CONFLICT (content): Merge conflict in scripts/components/Interactions/NavigationButton.js Auto-merging scripts/components/Interactions/NavigationButtonLabel.js CONFLICT (content): Merge conflict in scripts/components/Interactions/NavigationButtonLabel.js Auto-merging scripts/components/Interactions/OpenContent.js CONFLICT (content): Merge conflict in scripts/components/Interactions/OpenContent.js Auto-merging scripts/components/Interactions/OpenContent.scss Auto-merging scripts/components/Main.js CONFLICT (content): Merge conflict in scripts/components/Main.js Auto-merging scripts/components/Scene/Scene.js CONFLICT (content): Merge conflict in scripts/components/Scene/Scene.js Auto-merging scripts/components/Scene/SceneTypes/StaticScene.js CONFLICT (content): Merge conflict in scripts/components/Scene/SceneTypes/StaticScene.js Auto-merging scripts/components/Scene/SceneTypes/ThreeSixtyScene.js CONFLICT (content): Merge conflict in scripts/components/Scene/SceneTypes/ThreeSixtyScene.js Auto-merging scripts/utils/focus-trap.js Auto-merging scripts/utils/open-content-utils.js CONFLICT (modify/delete): scripts/utils/sanitization.js deleted in 31ece51 (Revert "Prepare for release") and modified in HEAD. Version HEAD of scripts/utils/sanitization.js left in tree. Auto-merging scripts/utils/utils.js CONFLICT (content): Merge conflict in scripts/utils/utils.js Auto-merging semantics.json CONFLICT (content): Merge conflict in semantics.json CONFLICT (modify/delete): stories/static/h5p-content-type.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release"). Version 31ece51 (Revert "Prepare for release") of stories/static/h5p-content-type.js left in tree. CONFLICT (modify/delete): stories/static/h5p-x-api-event.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release"). Version 31ece51 (Revert "Prepare for release") of stories/static/h5p-x-api-event.js left in tree. CONFLICT (modify/delete): stories/static/h5p.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release"). Version 31ece51 (Revert "Prepare for release") of stories/static/h5p.js left in tree. CONFLICT (modify/delete): stories/static/joubelui.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release"). Version 31ece51 (Revert "Prepare for release") of stories/static/joubelui.js left in tree. CONFLICT (modify/delete): stories/static/questions.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release"). Version 31ece51 (Revert "Prepare for release") of stories/static/questions.js left in tree. CONFLICT (modify/delete): stories/static/singlechoiceset.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release"). Version 31ece51 (Revert "Prepare for release") of stories/static/singlechoiceset.js left in tree. CONFLICT (modify/delete): stories/static/summary.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release"). Version 31ece51 (Revert "Prepare for release") of stories/static/summary.js left in tree. CONFLICT (modify/delete): stories/static/three-sixty.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release"). Version 31ece51 (Revert "Prepare for release") of stories/static/three-sixty.js left in tree. Auto-merging upgrades.js error: could not apply 31ece51... Revert "Prepare for release" 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 31ece51... Revert "Prepare for release" (1)6 days ago |
otacke
Repository rebase failed |
warning: skipped previously applied commit 3242db8 warning: skipped previously applied commit b08bcb2 warning: skipped previously applied commit ac7dda3 warning: skipped previously applied commit ddba6ca 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/lt.json CONFLICT (add/add): Merge conflict in language/lt.json error: could not apply 2e0d2a1... Gintarė <gintare.lose@ktu.lt> updated Lithuanian 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 2e0d2a1... Gintarė <gintare.lose@ktu.lt> updated Lithuanian translation using Weblate @ translate-h5p.tk. (1)6 days ago |
otacke
Repository rebase failed |
Rebasing (1/3) Auto-merging language/nb.json CONFLICT (content): Merge conflict in language/nb.json error: could not apply b56bb52... 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 b56bb52... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk. (1)6 days ago |
otacke
Repository rebase failed |
Rebasing (1/3) Rebasing (2/3) Rebasing (3/3) Auto-merging language/de.json CONFLICT (add/add): Merge conflict in language/de.json error: could not apply ada62c9... Update translation files 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 ada62c9... Update translation files (1)6 days ago |
otacke
Repository rebase failed |
Rebasing (1/2) Auto-merging language/nl.json CONFLICT (add/add): Merge conflict in language/nl.json error: could not apply 9d55fbc... Update translation files 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 9d55fbc... Update translation files (1)6 days ago |
otacke
Repository rebase failed |
warning: skipped previously applied commit d8d3d15 warning: skipped previously applied commit 5a69ab9 hint: use --reapply-cherry-picks to include skipped commits hint: Disable this message with "git config advice.skippedCherryPicks false" Rebasing (1/3) Auto-merging language/nb.json CONFLICT (content): Merge conflict in language/nb.json error: could not apply b677d25... 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 b677d25... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk. (1)6 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)6 days ago |
otacke
Repository rebase failed |
warning: skipped previously applied commit c00e758 hint: use --reapply-cherry-picks to include skipped commits hint: Disable this message with "git config advice.skippedCherryPicks false" Rebasing (1/1) Auto-merging src/scripts/h5p-crossword.js CONFLICT (content): Merge conflict in src/scripts/h5p-crossword.js error: could not apply 6b47020... Fix H5P contract before attached 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 6b47020... Fix H5P contract before attached (1)6 days ago |
otacke
Repository rebase failed |
Rebasing (1/6) Rebasing (2/6) Auto-merging language/zh-cn.json CONFLICT (add/add): Merge conflict in language/zh-cn.json error: could not apply 29ac532... "David.song" <david.song@cangloryeducation.com> updated Chinese (PRC) (zh-cn) translation using Weblate @ Deutsche H5P-Übersetzungscommunity. 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 29ac532... "David.song" <david.song@cangloryeducation.com> updated Chinese (PRC) (zh-cn) translation using Weblate @ Deutsche H5P-Übersetzungscommunity. (1)6 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)6 days ago |
otacke
Repository rebase failed |
warning: skipped previously applied commit 3242db8 warning: skipped previously applied commit b08bcb2 warning: skipped previously applied commit ac7dda3 warning: skipped previously applied commit ddba6ca 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/lt.json CONFLICT (add/add): Merge conflict in language/lt.json error: could not apply 2e0d2a1... Gintarė <gintare.lose@ktu.lt> updated Lithuanian 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 2e0d2a1... Gintarė <gintare.lose@ktu.lt> updated Lithuanian translation using Weblate @ translate-h5p.tk. (1)6 days ago |
otacke
Repository rebase failed |
Rebasing (1/2) Auto-merging language/nb.json CONFLICT (content): Merge conflict in language/nb.json error: could not apply ff8f8c5... 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 ff8f8c5... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk. (1)6 days ago |
otacke
Repository rebase failed |
Rebasing (1/2) Auto-merging language/nb.json CONFLICT (content): Merge conflict in language/nb.json error: could not apply 0c23e55... 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 0c23e55... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk. (1)6 days ago |
otacke
Repository rebase failed |
warning: skipped previously applied commit 886ebfa 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/he.json CONFLICT (add/add): Merge conflict in language/he.json error: could not apply 486e59f... Update translation files 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 486e59f... Update translation files (1)6 days ago |