From 44a64e3886b8b5f1d66b7d1310d24b8b6fe252a3 Mon Sep 17 00:00:00 2001
From: Jose Eduardo Kimura Reis <j.eduardokimura@icloud.com>
Date: Mon, 9 Nov 2020 22:39:07 +0100
Subject: [PATCH] :cyclone: Add pull strategy to release process

Check https://github.com/EndBug/add-and-commit/pull/72
---
 .github/workflows/release.yml | 6 ++----
 .gitignore                    | 1 -
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f01c1df..44fe98d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -23,17 +23,15 @@ jobs:
         uses: tyankatsu0105/read-package-version-actions@v1
         id: package-version
 
-      - name: Set git config
-        run: git config pull.rebase true
-
       - name: Commit changes
         uses: EndBug/add-and-commit@v5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           message: ':package: Release v${{ steps.package-version.outputs.version }}'
-          add: 'dist/* --force'
+          add: 'dist/*'
           branch: 'v${{ steps.package-version.outputs.version }}'
+          pull_strategy: '--no-rebase'
 
       - name: NPM Release
         uses: mikeal/merge-release@master
diff --git a/.gitignore b/.gitignore
index 98e732f..48411aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,4 @@ node_modules/*
 *.sw*
 .idea
 .cache
-dist
 *.log