switch to no-rebase

Author: hsubox76

.github/workflows/check-changeset.yml

@@ -26,7 +26,7 @@ jobs:
     - name: Run changeset script
       # pull master so changeset can diff against it
       run: |
-        git pull -f --ff-only origin master:master
+        git pull -f --no-rebase origin master:master
         yarn ts-node-script scripts/ci/check_changeset.ts
       id: check-changeset
     - name: Print changeset checker output

.github/workflows/release.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Add a changeset for @firebase/app
         # pull master so changeset can diff against it
         run: |
-          git pull -f --ff-only origin master:master
+          git pull -f --no-rebase origin master:master
           yarn ts-node-script scripts/ci/add_changeset.ts
 
       - name: Create Release Pull Request