2. Changes

Could not merge the repository. 5 months ago

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)

5 months ago

GitHub: https://github.com/otacke/h5p-crossword, master 5 months ago

ab.tbx: No such file or directory 5 months ago

Repository rebased

Original revision: 5c3d75aad0942fa3198d45655576296442d2f442
New revision: c00e758ac283eb37c42d53fc459fd4b932901ea2 5 months ago

GitHub: https://github.com/otacke/h5p-crossword, master 5 months ago

Repository rebased

Original revision: cfd5c0032051237aa71045c9d8072da153f79e76
New revision: 5c3d75aad0942fa3198d45655576296442d2f442 5 months ago

GitHub: https://github.com/otacke/h5p-crossword, master 5 months ago

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)

5 months ago

GitHub: https://github.com/otacke/h5p-game-map, master 5 months ago

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)

5 months ago

GitHub: https://github.com/otacke/h5p-game-map, master 5 months ago

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)

5 months ago

GitHub: https://github.com/otacke/h5p-game-map, master 5 months ago

ab.tbx: No such file or directory 5 months ago

Repository rebased

Original revision: c8e70c3408e322d88a4f6da1b158240a19890c08
New revision: cfd5c0032051237aa71045c9d8072da153f79e76 5 months ago

GitHub: https://github.com/otacke/h5p-crossword, master 5 months ago

Repository rebased

Original revision: 28d0f2ee0075a187393434a19a07b2285a754af0
New revision: c8e70c3408e322d88a4f6da1b158240a19890c08 5 months ago

GitHub: https://github.com/otacke/h5p-crossword, master 5 months ago

Repository rebased

Original revision: 9acc0e5c5a741a2723e1919d0803523f4b986b6c
New revision: 28d0f2ee0075a187393434a19a07b2285a754af0 5 months ago