None
Repository notification received |
GitHub: https://github.com/otacke/h5p-portfolio, master
8 months ago
|
None
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)8 months ago |
None
Repository notification received |
GitHub: https://github.com/otacke/h5p-portfolio, master
8 months ago
|
None
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)8 months ago |
None
Repository notification received |
GitHub: https://github.com/otacke/h5p-portfolio, master
8 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)10 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)10 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)10 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)10 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)10 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)10 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)10 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)10 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)10 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)10 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)10 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)10 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)10 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)10 months ago |
otacke
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)11 months ago |