User avatar None

Repository rebase failed

  1. H5P
  2. h5p-discussion
 
Rebasing (1/1)
error: could not apply d55d891... Alex Gabilondo <alexgabi@disroot.org> updated Basque 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 d55d891... Alex Gabilondo <alexgabi@disroot.org> updated Basque translation using Weblate @ translate-h5p.tk.
CONFLICT (add/add): Merge conflict in language/eu.json
Auto-merging language/eu.json
 (1)
a year ago
User avatar None

Repository notification received

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

Repository rebase failed

  1. H5P
  2. h5p-discussion
 
Rebasing (1/1)
error: could not apply d55d891... Alex Gabilondo <alexgabi@disroot.org> updated Basque 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 d55d891... Alex Gabilondo <alexgabi@disroot.org> updated Basque translation using Weblate @ translate-h5p.tk.
CONFLICT (add/add): Merge conflict in language/eu.json
Auto-merging language/eu.json
 (1)
a year ago
User avatar None

Repository notification received

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

Repository rebase failed

  1. H5P
  2. h5p-discussion
 
Rebasing (1/1)
error: could not apply d55d891... Alex Gabilondo <alexgabi@disroot.org> updated Basque 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 d55d891... Alex Gabilondo <alexgabi@disroot.org> updated Basque translation using Weblate @ translate-h5p.tk.
CONFLICT (add/add): Merge conflict in language/eu.json
Auto-merging language/eu.json
 (1)
a year ago
User avatar None

Repository notification received

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

Component locked

  1. H5P
  2. h5p-discussion
The component was automatically locked because of an alert. a year ago
User avatar None

Alert triggered

  1. H5P
  2. h5p-discussion
Could not merge the repository. a year ago
User avatar None

Repository rebase failed

  1. H5P
  2. h5p-discussion
 
Rebasing (1/1)
error: could not apply d55d891... Alex Gabilondo <alexgabi@disroot.org> updated Basque 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 d55d891... Alex Gabilondo <alexgabi@disroot.org> updated Basque translation using Weblate @ translate-h5p.tk.
CONFLICT (add/add): Merge conflict in language/eu.json
Auto-merging language/eu.json
 (1)
a year ago
User avatar None

Repository notification received

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

Repository rebased

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

Repository notification received

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

Repository rebased

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

Repository notification received

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

Repository rebased

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

Repository notification received

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

Component locked

  1. H5P
  2. h5p-sequence-process
The component was automatically locked because of an alert. a year ago
User avatar None

Alert triggered

  1. H5P
  2. h5p-sequence-process
Could not merge the repository. a year ago
User avatar None

Repository rebase failed

  1. H5P
  2. h5p-sequence-process
 
Rebasing (1/2)
error: could not apply 2b469b6... Rita Sidabraite Brunet <ritsid76@yahoo.com> updated Lithuanian 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 2b469b6... Rita Sidabraite Brunet <ritsid76@yahoo.com> updated Lithuanian translation using Weblate @ translate-h5p.tk.
CONFLICT (add/add): Merge conflict in language/lt.json
Auto-merging language/lt.json
 (1)
a year ago
User avatar None

Repository notification received

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

Search