2. Changes

warning: skipped previously applied commit 36c0e7f
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/app.js
CONFLICT (content): Merge conflict in src/scripts/app.js
error: could not apply 5d957c4... Fix fullscreen in preview
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 5d957c4... Fix fullscreen in preview
 (1)

a month ago

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)

a month ago

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)

a month ago

Repository rebased

Original revision: a7b461b4247c928d8008e7ce259e080b102bdf48
New revision: 93d3b3e5e939453afd88913026c0daceeb0711d1 a month ago

Repository rebased

Original revision: eb3df95613d1e9ed1b73866080e51202d196b064
New revision: f1a56842ba0460f5f5bcd7717c8935367b889567 a month ago

Repository rebased

Original revision: 432be76415f38d65adb799eeddc6a8d1d5dbc685
New revision: d32b8058e9e2c506fb0d1be27a3a746239c3cc95 a month ago

Repository rebased

Original revision: 0a7957a886e619406c34390ad20c581a9256ff2b
New revision: 373b28921552570ee67b7b322757c7cc76d33e28 a month ago

Repository rebased

Original revision: 6750626179085023aa2a08f65369168134fc0355
New revision: d281a2ea3be27816ada8d8df8557edb874d38302 a month ago

Repository rebased

Original revision: fa9b409100f110dffbb0461987e80606378cc10d
New revision: a9a2c8c90c0362a26ffac58d3c6c16242f4474da a month ago

Repository rebased

Original revision: 80f6fd92325b34f8ec2162ecb2cbf660f1662f40
New revision: 2fe1f4588d0193fcd4552f44c3e045a2781fd7cb a month ago

Repository rebased

Original revision: 176b4becb6603cb5e05ab3be1c39125a2ed0aa4b
New revision: 048e637052ae827d837a82924dec5ee6ee087e15 a month ago

Repository rebased

Original revision: bc2787905f7f131381cfcfbba7bbe2a6f5e4566d
New revision: 71b613ebed20a1a7d502849852ce61f159fad088 a month ago

warning: skipped previously applied commit 515efb8
warning: skipped previously applied commit 865539c
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/te.json
CONFLICT (add/add): Merge conflict in language/te.json
error: could not apply 394bce3... Sushumna Rao <sushumnarao@gmail.com> updated Telugu 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 394bce3... Sushumna Rao <sushumnarao@gmail.com> updated Telugu translation using Weblate @ translate-h5p.tk.
 (1)

a month ago

Repository rebased

Original revision: a41f3abbc615fcc809c2dce1916a1b9f796a2d35
New revision: dd1e0cd85a9530aa12efbb288f79d681b4bcbaa2 a month ago

Repository rebased

Original revision: 1b327ef73a1b52e415c39f8de0c2c75cd86ea52d
New revision: 827b39331550350e3272663af236255dc1edfc21 a month ago

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)

a month ago

Repository rebased

Original revision: 0616263f4a7f876b037fb2b06281f4294692cef1
New revision: d92202b475fbf7b247b55463d821101300b57907 a month ago

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)

a month ago

The component was automatically locked because of an alert. a month ago

Could not merge the repository. a month ago