From 1c4ca42603e43ea60707f85eced400c1702fa946 Mon Sep 17 00:00:00 2001 From: sriram veeraghanta Date: Mon, 29 Apr 2024 18:46:50 +0530 Subject: [PATCH] fix: auto merge workflow fixes --- .github/workflows/auto-merge.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index bc3548ccf..f31c11a69 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -74,10 +74,8 @@ jobs: - name: Merge Change to Target Branch if: env.HAS_CONFLICTS == 'false' run: | - git config user.name "$ACCOUNT_USER_NAME" - git config user.email "$ACCOUNT_USER_EMAIL" git commit -m "Merge branch '$SOURCE_BRANCH' into $TARGET_BRANCH" - git push origin $TARGET_BRANCH + git push origin HEAD:$TARGET_BRANCH - name: Create PR to Target Branch if: env.HAS_CONFLICTS == 'true'