Skip to content

Merge release/v3.32.0 with v3.32 with conflicts fixed #4938

Merge release/v3.32.0 with v3.32 with conflicts fixed

Merge release/v3.32.0 with v3.32 with conflicts fixed #4938

Triggered via pull request September 9, 2024 07:15
@ryaplotsryaplots
synchronize #7285
Status Failure
Total duration 39s
Artifacts

mergeability.yml

on: pull_request_target
Check Mergeability
31s
Check Mergeability
Fit to window
Zoom out
Zoom in

Annotations

2 errors and 10 warnings
Check Mergeability
Process completed with exit code 1.
Check Mergeability
Process completed with exit code 1.
Check Mergeability: api/ttn/lorawan/v3/api.md#L1
api/ttn/lorawan/v3/api.md has a conflict when merging TheThingsIndustries/lorawan-stack:v3.32.
Check Mergeability: api/ttn/lorawan/v3/api.swagger.json#L1
api/ttn/lorawan/v3/api.swagger.json has a conflict when merging TheThingsIndustries/lorawan-stack:v3.32.
Check Mergeability: cypress/e2e/console/admin-panel/admin-panel.spec.js#L1
cypress/e2e/console/admin-panel/admin-panel.spec.js has a conflict when merging TheThingsIndustries/lorawan-stack:v3.32.
Check Mergeability: cypress/e2e/console/admin-panel/network-information/network-information.spec.js#L1
cypress/e2e/console/admin-panel/network-information/network-information.spec.js has a conflict when merging TheThingsIndustries/lorawan-stack:v3.32.
Check Mergeability: cypress/e2e/console/auth/login.spec.js#L1
cypress/e2e/console/auth/login.spec.js has a conflict when merging TheThingsIndustries/lorawan-stack:v3.32.
Check Mergeability: cypress/e2e/console/gateways/edit.spec.js#L1
cypress/e2e/console/gateways/edit.spec.js has a conflict when merging TheThingsIndustries/lorawan-stack:v3.32.
Check Mergeability: cypress/e2e/console/shared/header.spec.js#L1
cypress/e2e/console/shared/header.spec.js has a conflict when merging TheThingsIndustries/lorawan-stack:v3.32.
Check Mergeability: cypress/e2e/smoke/applications/create.js#L1
cypress/e2e/smoke/applications/create.js has a conflict when merging TheThingsIndustries/lorawan-stack:v3.32.
Check Mergeability: cypress/e2e/smoke/devices/index.js#L1
cypress/e2e/smoke/devices/index.js has a conflict when merging TheThingsIndustries/lorawan-stack:v3.32.
Check Mergeability: cypress/e2e/smoke/profile-settings/index.js#L1
cypress/e2e/smoke/profile-settings/index.js has a conflict when merging TheThingsIndustries/lorawan-stack:v3.32.