From 0d66eba820b2beaf621beca10175e7de25419fd2 Mon Sep 17 00:00:00 2001
From: Thefrank <1910378+Thefrank@users.noreply.github.com>
Date: Sat, 19 Aug 2023 20:39:15 -0700
Subject: [PATCH] try different merge strat (#10)

* try different merge strat

* missed version bump
---
 azure-pipelines.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index adcd5ef..c6c183d 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -2,19 +2,19 @@ parameters:
 - name: runtimeBranch
   displayName: Tag for runtime repository
   type: string
-  default: v6.0.15
+  default: v6.0.21
 - name: aspBranch
   displayName: Tag for aspnetcore repository
   type: string
-  default: v6.0.15
+  default: v6.0.21
 - name: sdkBranch
   displayName: Tag for sdk repository
   type: string
-  default: v6.0.407
+  default: v6.0.413
 - name: installerBranch
   displayName: Tag for installer repository
   type: string
-  default: v6.0.407
+  default: v6.0.413
 
 variables:
   runCounter: $[counter('runNumber', 1)]
@@ -74,7 +74,7 @@ stages:
               set -e
               git -C runtime checkout ${{ parameters.runtimeBranch }}
               git -C runtime cherry-pick -n 3633a7d0930abaca701385c1059b80ca157e98c6
-              git -C runtime cherry-pick -n 3e6d492bdf6fbf2d8af3871379f31dcc6e27716b
+              git -C runtime cherry-pick -n 3e6d492bdf6fbf2d8af3871379f31dcc6e27716b -Xours
               sed -i '/\/dnceng\/internal\//d' runtime/NuGet.config
             displayName: Checkout and patch
           - bash: |