2. H5P
3. h5p-crossword
4. Changes

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

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

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