changing the merge to a replace (#11790)

Co-authored-by: tj_devel709 <antlambe@microsoft.com>
dotnet · Jun 4, 2021 · c527784 · c527784 · vs-mobiletools-engineering-service2 · Jun 5, 2021
1 parent 98b6a1f
commit c527784
Showing 1 changed file with 5 additions and 4 deletions.
diff --git 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'))