None
Repository notification received |
GitHub: https://github.com/Lumieducation/H5P-Nodejs-library, master
3 months ago
|
None
Repository rebased |
Repository rebased
Original revision: 70cb45a01fc035af92f2d729946896636db1da8c New revision: c77ff9235654a01d2da9b6bf3544ba6d231c3666 3 months ago |
None
Changes committed |
Changes committed
3 months ago
|
None
Repository notification received |
GitHub: https://github.com/Lumieducation/H5P-Nodejs-library, master
3 months ago
|
sushumna
Repository merge failed |
Auto-merging src/scripts/app.js CONFLICT (content): Merge conflict in src/scripts/app.js Automatic merge failed; fix conflicts and then commit the result. (1)3 months ago |
sushumna
Repository rebase failed |
warning: skipped previously applied commit 36c0e7f hint: use --reapply-cherry-picks to include skipped commits hint: Disable this message with "git config advice.skippedCherryPicks false" Rebasing (1/1) Auto-merging src/scripts/app.js CONFLICT (content): Merge conflict in src/scripts/app.js error: could not apply 5d957c4... Fix fullscreen in preview 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 5d957c4... Fix fullscreen in preview (1)3 months ago |
sushumna
Repository rebase failed |
warning: skipped previously applied commit 36c0e7f hint: use --reapply-cherry-picks to include skipped commits hint: Disable this message with "git config advice.skippedCherryPicks false" Rebasing (1/1) Auto-merging src/scripts/app.js CONFLICT (content): Merge conflict in src/scripts/app.js error: could not apply 5d957c4... Fix fullscreen in preview 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 5d957c4... Fix fullscreen in preview (1)3 months ago |
sushumna
Repository rebase failed |
warning: skipped previously applied commit 36c0e7f hint: use --reapply-cherry-picks to include skipped commits hint: Disable this message with "git config advice.skippedCherryPicks false" Rebasing (1/1) Auto-merging src/scripts/app.js CONFLICT (content): Merge conflict in src/scripts/app.js error: could not apply 5d957c4... Fix fullscreen in preview 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 5d957c4... Fix fullscreen in preview (1)3 months ago |
sushumna
Repository rebase failed |
warning: skipped previously applied commit 36c0e7f hint: use --reapply-cherry-picks to include skipped commits hint: Disable this message with "git config advice.skippedCherryPicks false" Rebasing (1/1) Auto-merging src/scripts/app.js CONFLICT (content): Merge conflict in src/scripts/app.js error: could not apply 5d957c4... Fix fullscreen in preview 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 5d957c4... Fix fullscreen in preview (1)3 months ago |
sushumna
Repository rebase failed |
warning: skipped previously applied commit 36c0e7f hint: use --reapply-cherry-picks to include skipped commits hint: Disable this message with "git config advice.skippedCherryPicks false" Rebasing (1/1) Auto-merging src/scripts/app.js CONFLICT (content): Merge conflict in src/scripts/app.js error: could not apply 5d957c4... Fix fullscreen in preview 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 5d957c4... Fix fullscreen in preview (1)3 months ago |
sushumna
Repository merge failed |
Auto-merging src/scripts/app.js CONFLICT (content): Merge conflict in src/scripts/app.js Automatic merge failed; fix conflicts and then commit the result. (1)3 months ago |
sushumna
Translation added |
|
sushumna
Translation added |
|
sushumna
Translation added |
|
sushumna
Translation added |
|
sushumna
Translation changed |
|
sushumna
Translation added |
|
sushumna
Translation added |
|
sushumna
Translation added |
|
sushumna
Translation added |
|