From c527784095406c478fbf2125b23837c13e9bfb10 Mon Sep 17 00:00:00 2001 From: TJ Lambert <50846373+tj-devel709@users.noreply.github.com> Date: Fri, 4 Jun 2021 10:14:46 -0500 Subject: [PATCH] changing the merge to a replace (#11790) Co-authored-by: tj_devel709 --- tools/devops/automation/templates/build/configure.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/devops/automation/templates/build/configure.yml b/tools/devops/automation/templates/build/configure.yml index 140f73a5b47a..377ba863df9e 100644 --- a/tools/devops/automation/templates/build/configure.yml +++ b/tools/devops/automation/templates/build/configure.yml @@ -159,11 +159,12 @@ steps: - powershell: | git config user.email "valco@microsoft.com" git config user.name "vs-mobiletools-engineering-service2" - git checkout -b Localization origin/Localization - git merge origin/main + git branch -d Localization + git push origin --delete Localization + git checkout -b Localization git push origin Localization - displayName: "Sync Localization branch with main" - condition: and(succeeded(), in(variables['build.reason'], 'Schedule', 'Manual'), eq(variables.isMain, 'True')) + displayName: "Create a new Localization branch from main" + condition: and(succeeded(), in(variables['build.reason'], 'Schedule'), eq(variables.isMain, 'True')) - task: OneLocBuild@2 condition: and(succeeded(), eq(variables.isMain, 'True'))