sushumna
Repository rebase failed |
8 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)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)8 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)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)8 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)8 months ago |
None
Changes pushed |
Changes pushed
8 months ago
|
None
Changes pushed |
Changes pushed
8 months ago
|
None
Repository rebased |
Repository rebased
Original revision: c74c6d52afae4e15dc18451336fc1253661c886e New revision: 0b7b02743ff8c3299dbd7c4bd3ed911781266966 8 months ago |
sushumna
Changes committed |
Changes committed
8 months ago
|
None
Repository rebased |
Repository rebased
Original revision: 96cceeebbf3a05330be85c2e76364ccedb85acdb New revision: 5ece1bca2e0b59e4fea4b56bb9b6f65a33029ff7 8 months ago |
sushumna
Changes committed |
Changes committed
8 months ago
|
sushumna
Changes committed |
Changes committed
8 months ago
|
None
Repository rebased |
Repository rebased
Original revision: 7f3dc4cbfb4238a846f608bff0b8040d803602bd New revision: 83143d0aad07903b1bdfa3eec4259d442bbb511e 8 months ago |
sushumna
Changes committed |
Changes committed
8 months ago
|
sushumna
Changes committed |
Changes committed
8 months ago
|
sushumna
Changes committed |
Changes committed
8 months ago
|
sushumna
Translation approved |
|
sushumna
Translation approved |
|
sushumna
Translation approved |
|