From 1477c9bd517cb7e64eef1271577a3bfe71e9ca9c Mon Sep 17 00:00:00 2001 From: TJ Lambert <50846373+tj-devel709@users.noreply.github.com> Date: Wed, 18 May 2022 15:18:34 -0500 Subject: [PATCH] [Localization] Use force-with-lease (#15054) Co-authored-by: TJ Lambert --- .github/workflows/localization_branch_sync.yml | 2 ++ tools/devops/automation/templates/loc-translations.yml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/localization_branch_sync.yml b/.github/workflows/localization_branch_sync.yml index e0775099b6..128ab653b8 100644 --- 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 index adc1556f7d..166aa3eb0f 100644 --- 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)