From 40d1558936bc53edf8e689a20e46e866b135b9ec Mon Sep 17 00:00:00 2001 From: Andy Augustin Date: Mon, 3 Jan 2022 21:07:39 +0100 Subject: [PATCH] fix(divergent_branches): (#142) fix issue with divergent branches :bug: --- src/entrypoint.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/src/entrypoint.sh b/src/entrypoint.sh index fdc8246..8121340 100755 --- a/src/entrypoint.sh +++ b/src/entrypoint.sh @@ -35,6 +35,7 @@ echo "::group::git init" echo "set git global configuration" git config --global user.email "github-action@actions-template-sync.noreply.github.com" git config --global user.name "${GITHUB_ACTOR}" +git config --global pull.rebase false echo "::endgroup::" # shellcheck source=src/sync_template.sh