User avatar None

Repository rebase failed

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

Repository notification received

  1. H5P
  2. h5p-sequence-process
GitHub: https://github.com/NDLANO/h5p-sequence-process, master a month ago

Search