[Pick][0.7 to 0.8] | 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)

[Pick][0.7 to 0.8] | 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) #581