From d7ebc6a1feac6ef30f16aaa7c8c03863d68d93ad Mon Sep 17 00:00:00 2001
From: nunoapfernandes <nunofernandes313@gmail.com>
Date: Mon, 11 Jul 2022 19:30:56 +0100
Subject: [PATCH 1/2] Attempt to merge changes from heroku before pushing new
 version

---
 README.md     | 2 +-
 entrypoint.sh | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d64648f..4b23b41 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ jobs:
       - uses: actions/checkout@v1
         with:
           ref: master # you can use this to get a non-detached head but it's not strictly required
-      - uses: ilkka/git-https-push-action@master
+      - uses: utrustdev/git-https-push-action@master
         name: Deploy
         with:
           remoteUrl: ${{ secrets.PUSH_REMOTE }}
diff --git a/entrypoint.sh b/entrypoint.sh
index 390fe20..3727a39 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -20,4 +20,5 @@ fi
 
 git config --global --add safe.directory /github/workspace
 git remote add $REMOTE $REMOTE_URL
+git pull
 git push $(join_by " " $EXTRA_ARGS) $REMOTE HEAD:master

From 9b458093a3610ecf0dedb913e90120fe8d416040 Mon Sep 17 00:00:00 2001
From: nunoapfernandes <nunofernandes313@gmail.com>
Date: Thu, 28 Jul 2022 17:41:32 +0100
Subject: [PATCH 2/2] Force push to heroku repo

---
 entrypoint.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/entrypoint.sh b/entrypoint.sh
index 3727a39..82118cb 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -20,5 +20,4 @@ fi
 
 git config --global --add safe.directory /github/workspace
 git remote add $REMOTE $REMOTE_URL
-git pull
-git push $(join_by " " $EXTRA_ARGS) $REMOTE HEAD:master
+git push --force $(join_by " " $EXTRA_ARGS) $REMOTE HEAD:master