User avatar None

Repository rebase failed

  1. H5P
  2. h5p-portfolio
 
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
User avatar None

Repository notification received

  1. H5P
  2. h5p-portfolio
GitHub: https://github.com/otacke/h5p-portfolio, master a month ago
User avatar None

Repository rebased

  1. H5P
  2. h5p-pick-the-symbols
Repository rebased

Original revision: 9a918c8e9800d4c0842329be0aa19cd60ed470c6
New revision: 0e4a5f7ad24738d709169dac7a0d7cf2a28c2a47 a month ago
User avatar None

Repository notification received

  1. H5P
  2. h5p-pick-the-symbols
GitHub: https://github.com/otacke/h5p-pick-the-symbols, master a month ago
User avatar None

Repository rebased

  1. H5P
  2. h5p-phrase-randomizer
Repository rebased

Original revision: ac0759619c2aff3d0808e7cc4150e9b95dc959f4
New revision: 79f956bfc4f9df8d077bc08bf3d135b0f0885454 a month ago
User avatar None

Repository notification received

  1. H5P
  2. h5p-phrase-randomizer
GitHub: https://github.com/otacke/h5p-phrase-randomizer, master a month ago
User avatar None

Repository rebased

  1. H5P
  2. h5p-kewar-code
Repository rebased

Original revision: 73464ee69259b8669f739456e34e9abe92da4b9f
New revision: 027b2cb7a3a888df61deb190eb1a1fe4c75366b4 a month ago
User avatar None

Repository notification received

  1. H5P
  2. h5p-kewar-code
GitHub: https://github.com/otacke/h5p-kewar-code, master a month ago
User avatar None

Repository rebased

  1. H5P
  2. h5p-jigsaw-puzzle
Repository rebased

Original revision: 5e186780deff4c3323df91cddb13fca98a73015b
New revision: 832829d6cd62ea43035cc8f5ab729602d2f5949f a month ago
User avatar None

Repository notification received

  1. H5P
  2. h5p-jigsaw-puzzle
GitHub: https://github.com/otacke/h5p-jigsaw-puzzle, master a month ago
User avatar None

Repository rebased

  1. H5P
  2. h5p-info-wall
Repository rebased

Original revision: a464d3b8b8c487732d7a8c40cb1e563c028bc908
New revision: 0d4ba8797d44be94040a6353500593a711e7553c a month ago
User avatar None

Repository notification received

  1. H5P
  2. h5p-info-wall
GitHub: https://github.com/otacke/h5p-info-wall, master a month ago
User avatar None

Repository rebased

  1. H5P
  2. h5p-image-zoom
Repository rebased

Original revision: 908743ad9acf3e0bba012c210fbdf138f5c804de
New revision: 4fd24ed9ed16625e3c7c8fbcb1cc0142258026d2 a month ago
User avatar None

Repository notification received

  1. H5P
  2. h5p-image-zoom
GitHub: https://github.com/otacke/h5p-image-zoom, master a month ago
User avatar None

Repository rebased

  1. H5P
  2. h5p-image-juxtaposition
Repository rebased

Original revision: 534a092e088f2ba98488d2e1216fb0b8a93b80ac
New revision: d6704134063523d7885a06104f47455f934e61fe a month ago
User avatar None

Repository notification received

  1. H5P
  2. h5p-image-juxtaposition
GitHub: https://github.com/otacke/h5p-image-juxtaposition, master a month ago
User avatar None

Repository rebase failed

  1. H5P
  2. h5p-game-map
 
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)
a month ago
User avatar None

Repository notification received

  1. H5P
  2. h5p-game-map
GitHub: https://github.com/otacke/h5p-game-map, master a month ago
User avatar None

Repository rebased

  1. H5P
  2. h5p-editor-portfolio-placeholder
Repository rebased

Original revision: edd5c4256dd7038a6b1f8f280453ea1937ebfc15
New revision: 9b6331ebafebf63d178da0c3ebd052f2ac1e87df a month ago
User avatar None

Repository notification received

  1. H5P
  2. h5p-editor-portfolio-placeholder
GitHub: https://github.com/otacke/h5p-editor-portfolio-placeholder, master a month ago

Search