2. H5P
3. h5p-vocabulary-drill
4. Changes

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

GitHub: https://github.com/NDLANO/h5p-vocabulary-drill, main a year ago

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

GitHub: https://github.com/NDLANO/h5p-vocabulary-drill, main a year ago

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

GitHub: https://github.com/NDLANO/h5p-vocabulary-drill, main a year ago

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

GitHub: https://github.com/NDLANO/h5p-vocabulary-drill, main a year ago

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

GitHub: https://github.com/NDLANO/h5p-vocabulary-drill, main a year ago

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

GitHub: https://github.com/NDLANO/h5p-vocabulary-drill, main a year ago

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

GitHub: https://github.com/NDLANO/h5p-vocabulary-drill, main a year ago

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

GitHub: https://github.com/NDLANO/h5p-vocabulary-drill, main a year ago

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

The component was automatically locked because of an alert. a year ago

Could not merge the repository. a year ago

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