 otacke
Repository rebase failed |
8 days ago
|
|
otacke
Repository rebase failed |
Rebasing (1/3) Rebasing (2/3) Rebasing (3/3) Auto-merging language/de.json CONFLICT (add/add): Merge conflict in language/de.json error: could not apply ada62c9... Update translation files 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 ada62c9... Update translation files (1)8 days ago |
|
otacke
Repository rebase failed |
Rebasing (1/3) Rebasing (2/3) Rebasing (3/3) Auto-merging language/de.json CONFLICT (add/add): Merge conflict in language/de.json error: could not apply ada62c9... Update translation files 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 ada62c9... Update translation files (1)8 days ago |
|
otacke
Repository rebase failed |
Rebasing (1/3) Rebasing (2/3) Rebasing (3/3) Auto-merging language/de.json CONFLICT (add/add): Merge conflict in language/de.json error: could not apply ada62c9... Update translation files 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 ada62c9... Update translation files (1)8 days ago |
|
otacke
Repository rebase failed |
Rebasing (1/3) Rebasing (2/3) Rebasing (3/3) Auto-merging language/de.json CONFLICT (add/add): Merge conflict in language/de.json error: could not apply ada62c9... Update translation files 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 ada62c9... Update translation files (1)8 days ago |
 None
Repository rebase failed |
Rebasing (1/3) Rebasing (2/3) Rebasing (3/3) Auto-merging language/de.json CONFLICT (add/add): Merge conflict in language/de.json error: could not apply ada62c9... Update translation files 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 ada62c9... Update translation files (1)2 weeks ago |
|
None
Repository notification received |
GitHub: https://github.com/otacke/h5p-editor-phrase-randomizer, master
2 weeks ago
|
|
None
Repository rebase failed |
Rebasing (1/3) Rebasing (2/3) Rebasing (3/3) Auto-merging language/de.json CONFLICT (add/add): Merge conflict in language/de.json error: could not apply ada62c9... Update translation files 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 ada62c9... Update translation files (1)3 weeks ago |
|
None
Repository notification received |
GitHub: https://github.com/otacke/h5p-editor-phrase-randomizer, master
3 weeks ago
|
|
None
Repository rebase failed |
Rebasing (1/3) Rebasing (2/3) Rebasing (3/3) Auto-merging language/de.json CONFLICT (add/add): Merge conflict in language/de.json error: could not apply ada62c9... Update translation files 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 ada62c9... Update translation files (1)a month ago |
|
None
Repository notification received |
GitHub: https://github.com/otacke/h5p-editor-phrase-randomizer, master
a month ago
|
|
None
Repository rebase failed |
Rebasing (1/3) Rebasing (2/3) Rebasing (3/3) Auto-merging language/de.json CONFLICT (add/add): Merge conflict in language/de.json error: could not apply ada62c9... Update translation files 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 ada62c9... Update translation files (1)2 months ago |
|
None
Repository notification received |
GitHub: https://github.com/otacke/h5p-editor-phrase-randomizer, master
2 months ago
|
|
None
Repository rebase failed |
Rebasing (1/3) Rebasing (2/3) Rebasing (3/3) Auto-merging language/de.json CONFLICT (add/add): Merge conflict in language/de.json error: could not apply ada62c9... Update translation files 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 ada62c9... Update translation files (1)2 months ago |
|
None
Repository notification received |
GitHub: https://github.com/otacke/h5p-editor-phrase-randomizer, master
2 months ago
|
|
None
Repository rebase failed |
Rebasing (1/3) Rebasing (2/3) Rebasing (3/3) Auto-merging language/de.json CONFLICT (add/add): Merge conflict in language/de.json error: could not apply ada62c9... Update translation files 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 ada62c9... Update translation files (1)2 months ago |
|
None
Repository notification received |
GitHub: https://github.com/otacke/h5p-editor-phrase-randomizer, master
2 months ago
|
|
None
Repository rebase failed |
Rebasing (1/3) Rebasing (2/3) Rebasing (3/3) Auto-merging language/de.json CONFLICT (add/add): Merge conflict in language/de.json error: could not apply ada62c9... Update translation files 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 ada62c9... Update translation files (1)2 months ago |
|
None
Repository notification received |
GitHub: https://github.com/otacke/h5p-editor-phrase-randomizer, master
2 months ago
|
|
None
Repository rebase failed |
Rebasing (1/3) Rebasing (2/3) Rebasing (3/3) Auto-merging language/de.json CONFLICT (add/add): Merge conflict in language/de.json error: could not apply ada62c9... Update translation files 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 ada62c9... Update translation files (1)2 months ago |