User avatar None

Repository rebase failed

  1. H5P
  2. h5p-vocabulary-drill
 
Rebasing (1/9)
Rebasing (2/9)
Rebasing (3/9)
error: could not apply 9646852... Update translation files
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 9646852... Update translation files
Auto-merging language/nb.json
CONFLICT (content): Merge conflict in language/nb.json
 (1)
a year ago
User avatar None

Repository notification received

  1. H5P
  2. h5p-vocabulary-drill
GitHub: https://github.com/NDLANO/h5p-vocabulary-drill, main a year ago
User avatar None

Repository rebased

  1. H5P
  2. h5p-editor-portfolio-placeholder
Repository rebased a year 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 year ago
User avatar None

Repository rebased

  1. H5P
  2. h5p-editor-portfolio
Repository rebased a year ago
User avatar None

Repository notification received

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

Repository rebased

  1. H5P
  2. h5p-editor-portfolio
Repository rebased a year ago
User avatar None

Repository notification received

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

Repository rebased

  1. H5P
  2. h5p-portfolio-placeholder
Repository rebased a year ago
User avatar None

Repository notification received

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

Repository rebased

  1. H5P
  2. h5p-portfolio-chapter
Repository rebased a year ago
User avatar None

Repository notification received

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

Repository rebased

  1. H5P
  2. h5p-portfolio
Repository rebased a year ago
User avatar None

Repository notification received

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

Repository rebased

  1. H5P
  2. h5p-portfolio
Repository rebased a year ago
User avatar None

Repository notification received

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

Repository rebased

  1. H5P
  2. h5p-portfolio
Repository rebased a year ago
User avatar None

Repository notification received

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

Repository rebase failed

  1. H5P
  2. h5p-branching-scenario
 
Rebasing (1/38)
error: could not apply 54c9114... Anonymous <noreply@weblate.org> updated French translation using Weblate @ translate-h5p.tk.
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 54c9114... Anonymous <noreply@weblate.org> updated French translation using Weblate @ translate-h5p.tk.
Auto-merging language/fr.json
CONFLICT (content): Merge conflict in language/fr.json
 (1)
a year ago
User avatar None

Changes committed

  1. H5P
  2. h5p-branching-scenario
  3. Czech
Changes committed a year ago

Search