diff --git a/ci/kokoro/build-merge-into-chromeos.sh b/ci/kokoro/build-merge-into-chromeos.sh index 9ecc36eaa0..2e84c68cab 100755 --- a/ci/kokoro/build-merge-into-chromeos.sh +++ b/ci/kokoro/build-merge-into-chromeos.sh @@ -207,9 +207,6 @@ main() { echo "Not enough commits to merge." fi - # Rebase to integrate cherry-picks. Always resolve conflicts with content from origin/main. - git rebase --rebase-merges -X theirs - upload_with_retries echo "Abandoning previous dry runs"