From fd05c130d475e7966f84f8106bc6259d542ec8d5 Mon Sep 17 00:00:00 2001 From: Dilan Bhalla Date: Mon, 24 Apr 2023 14:55:18 -0700 Subject: [PATCH] allow unrelated histories on merge --- .github/workflows/sync-main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync-main.yml b/.github/workflows/sync-main.yml index f3418a539e9..d31f8503dd6 100644 --- a/.github/workflows/sync-main.yml +++ b/.github/workflows/sync-main.yml @@ -31,7 +31,7 @@ jobs: - name: Sync Main shell: bash run: | - git merge codeql-cli/latest + git merge codeql-cli/latest --allow-unrelated-histories git push origin main git push origin --tags --force