mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2025-02-06 02:25:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Kokoro merge bot: Remove rebase for now

Browse source 
The recent cherry-pick of a revert has diverged the tree and caused
the commits inside the merge to be rebased as well, which uploads new
gerrit CLs for each commit.

BUG=None
TEST=./ci/kokoro/simulate.py ./ci/kokoro/build-x86_64.sh

Change-Id: I01af93c989ab0aba4c2d599d0625f921315a0600
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3566120
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Dennis Kempin <denniskempin@google.com>
This commit is contained in:
Dennis Kempin 2022-04-01 08:58:44 -07:00 committed by Chromeos LUCI
parent c7cd0e0114
commit 5b8a837485
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ci/kokoro/build-merge-into-chromeos.sh
View file

@ -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"