apply-pr: merge --ff-only instead of cherry-picking if possible