Closed
Description
This issue was created automatically because the backport of #90747 to v4.0-branch failed.
The backport to v4.0-branch failed:
Auto-merging modules/lvgl/lvgl.c
CONFLICT (content): Merge conflict in modules/lvgl/lvgl.c
error: could not apply 5cffb8e5a6d... modules: lvgl: Register print callback after lv_init
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
To backport manually, run these commands in your terminal:
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-v4.0-branch v4.0-branch
# Navigate to the new working tree
cd .worktrees/backport-v4.0-branch
# Create a new branch
git switch --create backport-90747-to-v4.0-branch
# Cherry-pick the merged commits of this pull request and resolve the conflicts
git cherry-pick -x 5cffb8e5a6d6447174b62cc3a724b47161a2678f
# Push it to GitHub
git push --set-upstream origin backport-90747-to-v4.0-branch
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-v4.0-branchThen, create a pull request where the base branch is v4.0-branch and the compare/head branch is backport-90747-to-v4.0-branch.