[Pick][0.8 to main] | AutoPR always using cherry-pick but do not resolve conflicts, just keep what it is and make PR, and able to simply edit PR to resolve conflicts manually (#707) (#708)

[Pick][0.8 to main] | AutoPR always using cherry-pick but do not resolve conflicts, just keep what it is and make PR, and able to simply edit PR to resolve conflicts manually (#707) (#708) #717