[Backport v4.2-branch] Failed to backport #94073 #97828
Description
This issue was created automatically because the backport of #94073 to v4.2-branch failed.
The backport to v4.2-branch failed:
Auto-merging modules/lvgl/CMakeLists.txt
Auto-merging modules/lvgl/include/lv_conf.h
CONFLICT (content): Merge conflict in modules/lvgl/include/lv_conf.h
error: could not apply 076994f4922... modules: lvgl: Fix stdlib usage
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.2-branch v4.2-branch
# Navigate to the new working tree
cd .worktrees/backport-v4.2-branch
# Create a new branch
git switch --create backport-94073-to-v4.2-branch
# Cherry-pick the merged commits of this pull request and resolve the conflicts
git cherry-pick -x 076994f49225779ff8ccdc9d3be13663d4096405
# Push it to GitHub
git push --set-upstream origin backport-94073-to-v4.2-branch
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-v4.2-branchThen, create a pull request where the base branch is v4.2-branch and the compare/head branch is backport-94073-to-v4.2-branch.