User avatar None

Repository rebase failed

  1. H5P
  2. JSXGraph
 
Rebasing (1/1)
error: could not apply e29497e... Translated using Weblate (Lithuanian)
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 e29497e... Translated using Weblate (Lithuanian)
CONFLICT (add/add): Merge conflict in language/lt.json
Auto-merging language/lt.json
 (1)
2 years ago

Search