tree 24947b548283389fc3c3b70d00e69633456774b2
parent 15054e6db66ee62e47eeeead7134b9e94a638fd7
author Rob Mohr <mohrr@pigweed.infra.roller.google.com> 1642813438 +0000
committer Copybara-Service <copybara-worker@google.com> 1642813557 -0800

[roll recipes_version.txt] checkout: Don't rebase merge commits

Detect merge commits based on how many parents they have and don't
rebase them.

Tested with led:

Original build: http://go/bbid/8824406343025130689.

$ led get-build 8824406343025130689 | led edit-recipe-bundle | led launch
https://ci.chromium.org/swarming/task/5896cb4735774d10?server=chrome-swarming.appspot.com

Original-Reviewed-on: https://pigweed-review.googlesource.com/c/infra/recipes/+/80788

https://pigweed.googlesource.com/infra/recipes
recipes_version.txt Rolled-Commits: 1749f47d513a747..7baaf47fbc745fb

GitOrigin-RevId: 4c56523b78a025e2cace9231cce50107a1e10bba
Change-Id: I57a12ae72dade93231abc26772c998056b93748f