fix(divergent_branches): (#142) fix issue with divergent branches 🐛

AndreasAugustin · Jan 3, 2022 · 40d1558 · 40d1558
1 parent fc7a8cf
commit 40d1558
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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 "[email protected]"
 git config --global user.name "${GITHUB_ACTOR}"
+git config --global pull.rebase false
 echo "::endgroup::"
 
 # shellcheck source=src/sync_template.sh