 None
Failed rebase on repository |
6 hours ago
|
|
None
Received repository notification |
GitLab: https://git.pleroma.social/pleroma/pleroma, develop
6 hours ago
|
|
None
Failed rebase on repository |
Rebasing (1/7) error: could not apply 6a7c05f97... CI: pass the variable BRANCH through to the api-docs build job 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 6a7c05f97... CI: pass the variable BRANCH through to the api-docs build job Auto-merging .gitlab-ci.yml CONFLICT (content): Merge conflict in .gitlab-ci.yml (1)8 hours ago |
|
None
Failed rebase on repository |
Rebasing (1/31) Rebasing (2/31) Rebasing (3/31) Rebasing (4/31) Rebasing (5/31) error: could not apply dfe67f1b0... Translated using Weblate (English) 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 dfe67f1b0... Translated using Weblate (English) Auto-merging src/i18n/en.json CONFLICT (content): Merge conflict in src/i18n/en.json (1)8 hours ago |
|
None
Failed rebase on repository |
Rebasing (1/7) error: could not apply 6a7c05f97... CI: pass the variable BRANCH through to the api-docs build job 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 6a7c05f97... CI: pass the variable BRANCH through to the api-docs build job Auto-merging .gitlab-ci.yml CONFLICT (content): Merge conflict in .gitlab-ci.yml (1)9 hours ago |
|
None
Failed rebase on repository |
Rebasing (1/31) Rebasing (2/31) Rebasing (3/31) Rebasing (4/31) Rebasing (5/31) error: could not apply dfe67f1b0... Translated using Weblate (English) 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 dfe67f1b0... Translated using Weblate (English) Auto-merging src/i18n/en.json CONFLICT (content): Merge conflict in src/i18n/en.json (1)9 hours ago |
|
None
Failed rebase on repository |
Rebasing (1/7) error: could not apply 6a7c05f97... CI: pass the variable BRANCH through to the api-docs build job 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 6a7c05f97... CI: pass the variable BRANCH through to the api-docs build job Auto-merging .gitlab-ci.yml CONFLICT (content): Merge conflict in .gitlab-ci.yml (1)9 hours ago |
|
None
Failed rebase on repository |
Rebasing (1/31) Rebasing (2/31) Rebasing (3/31) Rebasing (4/31) Rebasing (5/31) error: could not apply dfe67f1b0... Translated using Weblate (English) 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 dfe67f1b0... Translated using Weblate (English) Auto-merging src/i18n/en.json CONFLICT (content): Merge conflict in src/i18n/en.json (1)9 hours ago |
|
None
Failed rebase on repository |
Rebasing (1/7) error: could not apply 6a7c05f97... CI: pass the variable BRANCH through to the api-docs build job 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 6a7c05f97... CI: pass the variable BRANCH through to the api-docs build job Auto-merging .gitlab-ci.yml CONFLICT (content): Merge conflict in .gitlab-ci.yml (1)23 hours ago |
|
None
Failed rebase on repository |
Rebasing (1/31) Rebasing (2/31) Rebasing (3/31) Rebasing (4/31) Rebasing (5/31) error: could not apply dfe67f1b0... Translated using Weblate (English) 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 dfe67f1b0... Translated using Weblate (English) Auto-merging src/i18n/en.json CONFLICT (content): Merge conflict in src/i18n/en.json (1)23 hours ago |
|
None
Failed rebase on repository |
Rebasing (1/7) error: could not apply 6a7c05f97... CI: pass the variable BRANCH through to the api-docs build job 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 6a7c05f97... CI: pass the variable BRANCH through to the api-docs build job Auto-merging .gitlab-ci.yml CONFLICT (content): Merge conflict in .gitlab-ci.yml (1)2 days ago |
|
None
Failed rebase on repository |
Rebasing (1/31) Rebasing (2/31) Rebasing (3/31) Rebasing (4/31) Rebasing (5/31) error: could not apply dfe67f1b0... Translated using Weblate (English) 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 dfe67f1b0... Translated using Weblate (English) Auto-merging src/i18n/en.json CONFLICT (content): Merge conflict in src/i18n/en.json (1)2 days ago |
|
None
Failed rebase on repository |
Rebasing (1/7) error: could not apply 6a7c05f97... CI: pass the variable BRANCH through to the api-docs build job 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 6a7c05f97... CI: pass the variable BRANCH through to the api-docs build job Auto-merging .gitlab-ci.yml CONFLICT (content): Merge conflict in .gitlab-ci.yml (1)2 days ago |
|
None
Failed rebase on repository |
Rebasing (1/31) Rebasing (2/31) Rebasing (3/31) Rebasing (4/31) Rebasing (5/31) error: could not apply dfe67f1b0... Translated using Weblate (English) 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 dfe67f1b0... Translated using Weblate (English) Auto-merging src/i18n/en.json CONFLICT (content): Merge conflict in src/i18n/en.json (1)2 days ago |
|
None
Failed rebase on repository |
Rebasing (1/31) Rebasing (2/31) Rebasing (3/31) Rebasing (4/31) Rebasing (5/31) error: could not apply dfe67f1b0... Translated using Weblate (English) 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 dfe67f1b0... Translated using Weblate (English) Auto-merging src/i18n/en.json CONFLICT (content): Merge conflict in src/i18n/en.json (1)3 days ago |
|
None
Failed rebase on repository |
Rebasing (1/7) error: could not apply 6a7c05f97... CI: pass the variable BRANCH through to the api-docs build job 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 6a7c05f97... CI: pass the variable BRANCH through to the api-docs build job Auto-merging .gitlab-ci.yml CONFLICT (content): Merge conflict in .gitlab-ci.yml (1)3 days ago |
|
None
Failed rebase on repository |
Rebasing (1/7) error: could not apply 6a7c05f97... CI: pass the variable BRANCH through to the api-docs build job 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 6a7c05f97... CI: pass the variable BRANCH through to the api-docs build job Auto-merging .gitlab-ci.yml CONFLICT (content): Merge conflict in .gitlab-ci.yml (1)3 days ago |
|
None
Failed rebase on repository |
Rebasing (1/31) Rebasing (2/31) Rebasing (3/31) Rebasing (4/31) Rebasing (5/31) error: could not apply dfe67f1b0... Translated using Weblate (English) 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 dfe67f1b0... Translated using Weblate (English) Auto-merging src/i18n/en.json CONFLICT (content): Merge conflict in src/i18n/en.json (1)3 days ago |
|
None
Failed rebase on repository |
Rebasing (1/7) error: could not apply 6a7c05f97... CI: pass the variable BRANCH through to the api-docs build job 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 6a7c05f97... CI: pass the variable BRANCH through to the api-docs build job Auto-merging .gitlab-ci.yml CONFLICT (content): Merge conflict in .gitlab-ci.yml (1)3 days ago |
|
None
Failed rebase on repository |
Rebasing (1/31) Rebasing (2/31) Rebasing (3/31) Rebasing (4/31) Rebasing (5/31) error: could not apply dfe67f1b0... Translated using Weblate (English) 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 dfe67f1b0... Translated using Weblate (English) Auto-merging src/i18n/en.json CONFLICT (content): Merge conflict in src/i18n/en.json (1)3 days ago |