The automatic rebase of the develop patch series onto main failed.
Conflicting files (empty if the failure was the patch-series sanity check — see the workflow run log):
apps/builder/dev/backend.sh
To resolve locally:
git fetch origin
git checkout develop
git rebase origin/main
# resolve each conflict by adapting the fork patch to the new upstream code
# (patch intents are listed in COMMUNITY_CHANGES.md), then:
git push --force-with-lease origin develop
A backup tag of the pre-rebase state was pushed (see the workflow run log).
The automatic rebase of the
developpatch series ontomainfailed.Conflicting files (empty if the failure was the patch-series sanity check — see the workflow run log):
To resolve locally:
A backup tag of the pre-rebase state was pushed (see the workflow run log).