From 31556891ef1ff430f0e48acfbe700e5e10b08b3f Mon Sep 17 00:00:00 2001
From: Mo <mo@standardnotes.com>
Date: Mon, 20 Jun 2022 12:04:32 -0500
Subject: [PATCH] chore(workflows): git

---
 .github/workflows/promote.develop.yml | 1 +
 .github/workflows/publish.yml         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/promote.develop.yml b/.github/workflows/promote.develop.yml
index d8a1e3a8c..4ef5fd892 100644
--- a/.github/workflows/promote.develop.yml
+++ b/.github/workflows/promote.develop.yml
@@ -29,6 +29,7 @@ jobs:
 
       - name: Merge Develop into Main
         run: |
+          git config pull.rebase false
           git checkout main
           git pull origin develop
           git push origin main
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index bc2390f51..a55442b22 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -63,6 +63,7 @@ jobs:
       - name: Merge release into develop
         if: ${{ github.ref == 'refs/heads/main' }}
         run: |
+          git config pull.rebase false
           git checkout develop
           git pull origin main
           git push origin develop