From a1deef1660f1ab2a2cabcd6e0236f03bdbdd5c5e Mon Sep 17 00:00:00 2001 From: Arpit Mohan Date: Tue, 26 Oct 2021 16:37:21 +0530 Subject: [PATCH] chore: Updating the sync workflow to use merge strategy --- .github/workflows/sync-community-repo.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/sync-community-repo.yml b/.github/workflows/sync-community-repo.yml index 55dae7573e..518934e380 100644 --- a/.github/workflows/sync-community-repo.yml +++ b/.github/workflows/sync-community-repo.yml @@ -22,6 +22,7 @@ jobs: git remote add community https://github.com/appsmithorg/appsmith.git git config user.email "automated@github.com" git config user.name "Automated Github Action" + git config pull.rebase false git pull community release --no-edit git push origin release