using force-with-lease

dotnet · May 17, 2022 · fe42556 · fe42556
1 parent 2aae39d
commit fe42556
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.github/workflows/localization_branch_sync.yml b/.github/workflows/localization_branch_sync.yml
@@ -1,3 +1,5 @@
+# Disabling this action since we do something similar already in the CI
+
 name: Sync Localization Branch
 on:
   pull_request:

diff --git a/tools/devops/automation/templates/loc-translations.yml b/tools/devops/automation/templates/loc-translations.yml
@@ -52,7 +52,7 @@ steps:
     git push origin --delete Localization
 
     git checkout -b Localization
-    git push origin Localization
+    git push --force-with-lease origin Localization
   displayName: "Create a new Localization branch from main"
   workingDirectory: $(Build.SourcesDirectory)