Nuttx with stm32h7: STM32H7X5XX selects hardware files backport

[jfbblue0922]

px4 nuttx commit: PX4/NuttX#317

I would PR the changes I made to nuttx to test with PX4 Autopilot.

[jfbblue0922]

@davids5

I made a PR following the advice in PX4/NuttX#317, but the check result was as follows.

This branch has conflicts that must be resolved
Only those with write access to this repository can merge pull requests.
Conflicting files
platforms/nuttx/NuttX/nuttx

How do I resolve this conflict ?
Please support me with the solution.

[davids5]

@davids5

I made a PR following the advice in PX4/NuttX#317, but the check result was as follows.

This branch has conflicts that must be resolved Only those with write access to this repository can merge pull requests. Conflicting files platforms/nuttx/NuttX/nuttx

How do I resolve this conflict ? Please support me with the solution.

Rebase

git fetch <PX4 repo>
git check out main
git pull <PX4 repo>  main
git check pr-stm32h7-update
git rebase main
in platform/nuttx/Nuttx/nuttx check out pr-stm32h755II-2
git add platform/nuttx/Nuttx/nuttx
git commit --amend platform/nuttx/Nuttx/nuttx
git push -f <your repo> pr-stm32h7-update 

[jfbblue0922]

@davids5

Thank you for your advice.
I pushed on branch.

The check result was as follows.
This branch is out-of-date with the base branch
Merge the latest changes from main into this branch.
About, You are prompted to make a choice.
Should I choose "Update with merge commit" or "Update with rebase" ?